# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1409162526 -7200
# Node ID a1cb03f6b606009094ca1bc6c3a822d020267065
# Parent  a65b459ab270d269fe04509e80ce7125f2f5be77# Parent  74520179dda849085688a729043ddd0179d88d01
Merge.

diff -r a65b459ab270 -r a1cb03f6b606 mx/mx_graal.py
--- a/mx/mx_graal.py	Wed Aug 27 20:01:44 2014 +0200
+++ b/mx/mx_graal.py	Wed Aug 27 20:02:06 2014 +0200
@@ -1059,7 +1059,7 @@
     else:
         return [], args
 
-def _run_tests(args, harness, annotations, testfile, whitelist, regex):
+def _run_tests(args, harness, annotations, testfile, blacklist, whitelist, regex):
 
 
     vmArgs, tests = _extract_VM_args(args)
@@ -1106,6 +1106,9 @@
                     mx.log('warning: no tests matched by substring "' + t)
         projectsCp = mx.classpath(projs)
 
+    if blacklist:
+        classes = [c for c in classes if not any((glob.match(c) for glob in blacklist))]
+
     if whitelist:
         classes = [c for c in classes if any((glob.match(c) for glob in whitelist))]
 
@@ -1119,7 +1122,7 @@
         f_testfile.close()
         harness(projectsCp, vmArgs)
 
-def _unittest(args, annotations, prefixCp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False, gc_after_test=False):
+def _unittest(args, annotations, prefixCp="", blacklist=None, whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False, gc_after_test=False):
     testfile = os.environ.get('MX_TESTFILE', None)
     if testfile is None:
         (_, testfile) = tempfile.mkstemp(".testclasses", "graal")
@@ -1169,7 +1172,7 @@
             vm(prefixArgs + vmArgs + ['-cp', cp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + ['@' + testfile])
 
     try:
-        _run_tests(args, harness, annotations, testfile, whitelist, regex)
+        _run_tests(args, harness, annotations, testfile, blacklist, whitelist, regex)
     finally:
         if os.environ.get('MX_TESTFILE') is None:
             os.remove(testfile)
@@ -1177,6 +1180,7 @@
 _unittestHelpSuffix = """
     Unittest options:
 
+      --blacklist <file>     run all testcases not specified in the blacklist
       --whitelist <file>     run only testcases which are included
                              in the given whitelist
       --verbose              enable verbose JUnit output
@@ -1221,6 +1225,7 @@
           formatter_class=RawDescriptionHelpFormatter,
           epilog=_unittestHelpSuffix,
         )
+    parser.add_argument('--blacklist', help='run all testcases not specified in the blacklist', metavar='<path>')
     parser.add_argument('--whitelist', help='run testcases specified in whitelist only', metavar='<path>')
     parser.add_argument('--verbose', help='enable verbose JUnit output', action='store_true')
     parser.add_argument('--enable-timing', help='enable JUnit test timing', action='store_true')
@@ -1252,6 +1257,12 @@
                 parsed_args.whitelist = [re.compile(fnmatch.translate(l.rstrip())) for l in fp.readlines() if not l.startswith('#')]
         except IOError:
             mx.log('warning: could not read whitelist: ' + parsed_args.whitelist)
+    if parsed_args.blacklist:
+        try:
+            with open(join(_graal_home, parsed_args.blacklist)) as fp:
+                parsed_args.blacklist = [re.compile(fnmatch.translate(l.rstrip())) for l in fp.readlines() if not l.startswith('#')]
+        except IOError:
+            mx.log('warning: could not read blacklist: ' + parsed_args.blacklist)
 
     _unittest(args, ['@Test', '@Parameters'], **parsed_args.__dict__)
 
@@ -1952,8 +1963,12 @@
         'intel/hsdis-amd64.dylib' : 'fdb13ef0d7d23d93dacaae9c98837bea0d4fc5a2',
     }
 
+    flavoredLib = flavor + "/" + lib
+    if flavoredLib not in sha1s:
+        mx.logv("hsdis not supported on this plattform or architecture")
+        return
+
     if not exists(path):
-        flavoredLib = flavor + "/" + lib
         sha1 = sha1s[flavoredLib]
         sha1path = path + '.sha1'
         mx.download_file_with_sha1('hsdis', path, ['http://lafo.ssw.uni-linz.ac.at/hsdis/' + flavoredLib], sha1, sha1path, True, True, sources=False)
diff -r a65b459ab270 -r a1cb03f6b606 test/blacklist_sparc.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/blacklist_sparc.txt	Wed Aug 27 20:02:06 2014 +0200
@@ -0,0 +1,310 @@
+com.oracle.graal.jtt.lang.Object_equals01
+com.oracle.graal.replacements.test.CheckCastTest
+com.oracle.graal.hotspot.test.AheadOfTimeCompilationTest
+com.oracle.graal.jtt.reflect.Invoke_except01
+com.oracle.graal.jtt.bytecode.BC_fastore
+com.oracle.graal.compiler.test.deopt.MonitorDeoptTest
+com.oracle.graal.jtt.loop.LoopParseLong
+com.oracle.graal.jtt.bytecode.BC_baload
+com.oracle.graal.jtt.threads.ThreadLocal01
+com.oracle.graal.jtt.jdk.UnsafeAllocateInstance01
+com.oracle.graal.jtt.threads.ThreadLocal02
+com.oracle.graal.jtt.optimize.ConditionalElimination01
+com.oracle.graal.jtt.threads.ThreadLocal03
+com.oracle.graal.jtt.except.BC_athrow3
+com.oracle.graal.jtt.except.BC_checkcast
+com.oracle.graal.jtt.micro.VarArgs_short01
+com.oracle.graal.replacements.test.InvokeTest
+com.oracle.graal.jtt.reflect.Invoke_virtual01
+com.oracle.graal.jtt.lang.Math_cos
+com.oracle.graal.jtt.lang.Math_log10
+com.oracle.graal.jtt.optimize.Narrow_char02
+com.oracle.graal.jtt.lang.Math_sin
+com.oracle.graal.jtt.bytecode.BC_lookupswitch05
+com.oracle.graal.jtt.except.BC_aastore0
+com.oracle.graal.jtt.reflect.Class_getDeclaredField01
+com.oracle.graal.jtt.micro.VarArgs_double01
+com.oracle.graal.jtt.micro.String_format02
+com.oracle.graal.compiler.hsail.test.lambda.ArrayListSetTest
+com.oracle.graal.jtt.optimize.List_reorder_bug
+com.oracle.graal.jtt.hotpath.HP_idea
+com.oracle.graal.jtt.except.Throw_Synchronized01
+com.oracle.graal.jtt.lang.Bridge_method01
+com.oracle.graal.compiler.test.IfReorderTest
+com.oracle.graal.jtt.optimize.Switch02
+com.oracle.graal.jtt.jdk.Thread_setName
+com.oracle.graal.jtt.reflect.Array_set01
+com.oracle.graal.jtt.reflect.Array_set02
+com.oracle.graal.jtt.except.BC_checkcast5
+com.oracle.graal.jtt.micro.VarArgs_float01
+com.oracle.graal.jtt.bytecode.BC_monitorenter
+com.oracle.graal.jtt.hotpath.HP_array04
+com.oracle.graal.compiler.hsail.test.lambda.StringSubstringTest
+com.oracle.graal.jtt.hotpath.HP_array03
+com.oracle.graal.jtt.hotpath.HP_array02
+com.oracle.graal.jtt.threads.Thread_isInterrupted03
+com.oracle.graal.jtt.threads.Thread_isInterrupted02
+com.oracle.graal.jtt.threads.Thread_isInterrupted05
+com.oracle.graal.jtt.lang.ClassLoader_loadClass01
+com.oracle.graal.jtt.optimize.NCE_02
+com.oracle.graal.jtt.lang.Object_hashCode01
+com.oracle.graal.jtt.loop.Loop09
+com.oracle.graal.compiler.hsail.test.lambda.DremTest
+com.oracle.graal.replacements.test.StandardMethodSubstitutionsTest
+com.oracle.graal.jtt.jdk.UnsafeAccess01
+com.oracle.graal.jtt.loop.LoopSwitch01
+com.oracle.graal.jtt.except.Catch_NASE_2
+com.oracle.graal.jtt.threads.Thread_setPriority01
+com.oracle.graal.jtt.except.BC_checkcast3
+com.oracle.graal.jtt.reflect.Invoke_main03
+com.oracle.graal.jtt.except.BC_aastore1
+com.oracle.graal.jtt.except.BC_saload
+com.oracle.graal.jtt.threads.Monitor_contended01
+com.oracle.graal.jtt.lang.Class_getName02
+com.oracle.graal.jtt.reflect.Invoke_main01
+com.oracle.graal.jtt.lang.Math_sqrt
+com.oracle.graal.jtt.bytecode.BC_ldc_06
+com.oracle.graal.jtt.optimize.ConditionalElimination02
+com.oracle.graal.jtt.lang.String_intern02
+com.oracle.truffle.sl.test.SLSimpleTestSuite
+com.oracle.graal.jtt.micro.Bubblesort
+com.oracle.graal.jtt.lang.String_intern03
+com.oracle.graal.jtt.hotpath.HP_demo01
+com.oracle.graal.jtt.optimize.ArrayLength01
+com.oracle.graal.replacements.test.DynamicNewArrayTest
+com.oracle.graal.jtt.micro.InvokeVirtual_02
+com.oracle.graal.jtt.lang.Object_getClass01
+com.oracle.graal.jtt.micro.Matrix01
+com.oracle.graal.replacements.test.NewInstanceTest
+com.oracle.graal.jtt.lang.Class_getSimpleName01
+com.oracle.graal.jtt.lang.Class_getSimpleName02
+com.oracle.graal.jtt.bytecode.BC_d2l02
+com.oracle.graal.jtt.except.BC_checkcast6
+com.oracle.graal.jtt.lang.Class_getSuperClass01
+com.oracle.graal.jtt.lang.Class_getInterfaces01
+com.oracle.graal.jtt.lang.Class_Literal01
+com.oracle.graal.replacements.test.StringSubstitutionsTest
+com.oracle.graal.jtt.except.BC_checkcast4
+com.oracle.graal.jtt.bytecode.BC_f2l02
+com.oracle.graal.jtt.micro.VarArgs_long01
+com.oracle.graal.compiler.test.ea.UnsafeEATest
+com.oracle.graal.jtt.except.Catch_NASE_1
+com.oracle.graal.jtt.bytecode.BC_iastore
+com.oracle.graal.compiler.test.ShortCircuitNodeTest
+com.oracle.graal.jtt.threads.Thread_isInterrupted04
+com.oracle.graal.jtt.jdk.EnumMap02
+com.oracle.graal.jtt.threads.Monitor_notowner01
+com.oracle.graal.hotspot.test.ArrayCopyIntrinsificationTest
+com.oracle.graal.jtt.bytecode.BC_putfield_01
+com.oracle.graal.jtt.lang.Math_tan
+com.oracle.graal.jtt.bytecode.BC_aaload
+com.oracle.graal.jtt.optimize.Narrow_short03
+com.oracle.graal.jtt.optimize.Narrow_short02
+com.oracle.graal.jtt.optimize.ArrayCopy01
+com.oracle.graal.jtt.bytecode.BC_athrow
+com.oracle.graal.jtt.except.BC_sastore
+com.oracle.graal.jtt.bytecode.BC_d2i02
+com.oracle.graal.jtt.threads.Object_wait01
+com.oracle.graal.jtt.bytecode.BC_sastore
+com.oracle.graal.jtt.bytecode.BC_l2i_2
+com.oracle.graal.jtt.micro.BigObjectParams02
+com.oracle.graal.jtt.except.StackTrace_NPE_01
+com.oracle.graal.compiler.test.CommonedConstantsTest
+com.oracle.graal.jtt.bytecode.BC_getfield
+com.oracle.graal.jtt.bytecode.BC_laload
+com.oracle.graal.hotspot.test.WriteBarrierAdditionTest
+com.oracle.graal.jtt.hotpath.HP_life
+com.oracle.graal.hotspot.test.CRC32SubstitutionsTest
+com.oracle.graal.jtt.lang.Boxed_TYPE_01
+com.oracle.graal.jtt.reflect.Class_getDeclaredMethod01
+com.oracle.graal.jtt.threads.Thread_new02
+com.oracle.graal.jtt.threads.Thread_new01
+com.oracle.graal.jtt.except.BC_caload
+com.oracle.graal.compiler.hsail.test.StaticMethod16InArraysTest
+com.oracle.graal.jtt.jdk.Unsafe_compareAndSwap
+com.oracle.graal.replacements.test.MonitorTest
+com.oracle.graal.jtt.except.Throw_Synchronized05
+com.oracle.graal.jtt.reflect.Array_newInstance02
+com.oracle.graal.jtt.reflect.Array_newInstance03
+com.oracle.graal.jtt.reflect.Array_newInstance01
+com.oracle.graal.jtt.reflect.Array_newInstance06
+com.oracle.graal.jtt.micro.VarArgs_byte01
+com.oracle.graal.jtt.except.BC_laload
+com.oracle.graal.compiler.test.ea.EscapeAnalysisTest
+com.oracle.graal.jtt.except.Throw_Synchronized02
+com.oracle.graal.jtt.except.Throw_Synchronized04
+com.oracle.graal.jtt.optimize.NestedLoop_EA
+com.oracle.graal.jtt.except.BC_newarray
+com.oracle.graal.jtt.loop.Loop15
+com.oracle.graal.compiler.hsail.test.lambda.ObjectArrayInstanceDerivedTest
+com.oracle.graal.jtt.bytecode.BC_checkcast01
+com.oracle.graal.jtt.except.BC_anewarray
+com.oracle.graal.hotspot.amd64.test.CompressedNullCheckTest
+com.oracle.graal.compiler.test.MemoryArithmeticTest
+com.oracle.graal.jtt.bytecode.BC_getfield_o
+com.oracle.graal.jtt.lang.Class_getComponentType01
+com.oracle.graal.jtt.reflect.Array_newInstance04
+com.oracle.graal.jtt.reflect.Method_getParameterTypes01
+com.oracle.graal.compiler.test.inlining.InliningTest
+com.oracle.graal.hotspot.test.InstalledCodeExecuteHelperTest
+com.oracle.graal.jtt.except.BC_castore
+com.oracle.graal.jtt.lang.Class_isInstance06
+com.oracle.graal.jtt.lang.Class_isInstance07
+com.oracle.graal.jtt.threads.Thread_join03
+com.oracle.graal.jtt.threads.Thread_join01
+com.oracle.graal.jtt.except.BC_putfield
+com.oracle.graal.jtt.lang.Class_forName03
+com.oracle.graal.jtt.lang.Class_forName04
+com.oracle.graal.jtt.lang.Class_forName05
+com.oracle.graal.jtt.hotspot.Test6186134
+com.oracle.graal.jtt.optimize.NCE_03
+com.oracle.graal.jtt.micro.String_format01
+com.oracle.graal.jtt.except.BC_lastore
+com.oracle.graal.jtt.bytecode.BC_monitorenter02
+com.oracle.graal.jtt.micro.ReferenceMap01
+com.oracle.graal.jtt.bytecode.BC_instanceof
+com.oracle.graal.jtt.except.Catch_Unresolved
+com.oracle.graal.compiler.test.MemoryScheduleTest
+com.oracle.graal.jtt.bytecode.BC_castore
+com.oracle.graal.jtt.except.Throw_InCatch03
+com.oracle.graal.jtt.except.Throw_InCatch02
+com.oracle.graal.jtt.except.Throw_InCatch01
+com.oracle.graal.jtt.except.BC_iaload
+com.oracle.graal.jtt.lang.Double_toString
+com.oracle.graal.jtt.optimize.ABCE_02
+com.oracle.graal.replacements.test.CompiledExceptionHandlerTest
+com.oracle.graal.jtt.except.Throw_Synchronized03
+com.oracle.graal.jtt.threads.Thread_join02
+com.oracle.graal.jtt.threads.SynchronizedLoopExit01
+com.oracle.graal.jtt.bytecode.BC_daload
+com.oracle.graal.jtt.optimize.Conditional01
+com.oracle.graal.jtt.lang.JDK_ClassLoaders02
+com.oracle.graal.jtt.bytecode.BC_putfield_03
+com.oracle.graal.jtt.bytecode.BC_putfield_02
+com.oracle.graal.jtt.micro.BigInterfaceParams01
+com.oracle.graal.jtt.micro.VarArgs_String01
+com.oracle.graal.jtt.optimize.LongToSomethingArray01
+com.oracle.graal.jtt.except.BC_checkcast1
+com.oracle.graal.jtt.except.Catch_NPE_07
+com.oracle.graal.jtt.except.Catch_NPE_06
+com.oracle.graal.jtt.except.Catch_NPE_02
+com.oracle.graal.jtt.except.Catch_NPE_01
+com.oracle.graal.replacements.test.ArraysSubstitutionsTest
+com.oracle.graal.jtt.except.StackTrace_CCE_00
+com.oracle.graal.jtt.lang.ProcessEnvironment_init
+com.oracle.graal.jtt.except.BC_bastore
+com.oracle.graal.jtt.except.BC_baload
+com.oracle.graal.jtt.lang.Class_asSubclass01
+com.oracle.graal.jtt.bytecode.BC_invokevirtual
+com.oracle.graal.compiler.test.BoxingEliminationTest
+com.oracle.graal.compiler.test.deopt.CompiledMethodTest
+com.oracle.graal.compiler.ptx.test.ArrayPTXTest
+com.oracle.graal.jtt.reflect.Class_getMethod01
+com.oracle.graal.compiler.test.InfopointReasonTest
+com.oracle.graal.jtt.reflect.Class_getMethod02
+com.oracle.graal.jtt.bytecode.BC_invokespecial2
+com.oracle.graal.jtt.reflect.Method_getReturnType01
+com.oracle.graal.replacements.test.InstanceOfTest
+com.oracle.graal.jtt.bytecode.BC_invokespecial
+com.oracle.graal.jtt.lang.Object_toString02
+com.oracle.graal.jtt.lang.Object_toString01
+com.oracle.graal.jtt.jdk.EnumMap01
+com.oracle.graal.jtt.except.BC_checkcast2
+com.oracle.graal.replacements.test.InstanceOfDynamicTest
+com.oracle.graal.hotspot.test.HotSpotNodeSubstitutionsTest
+com.oracle.graal.replacements.test.UnsignedMathTest
+com.oracle.graal.jtt.reflect.Field_get03
+com.oracle.graal.jtt.bytecode.BC_putfield_04
+com.oracle.graal.hotspot.test.CompressedOopTest
+com.oracle.graal.jtt.except.BC_daload
+com.oracle.graal.hotspot.amd64.test.AMD64HotSpotFrameOmissionTest
+com.oracle.graal.jtt.hotpath.HP_allocate04
+com.oracle.graal.jtt.hotpath.HP_allocate03
+com.oracle.graal.jtt.optimize.NCE_01
+com.oracle.graal.jtt.optimize.NCE_04
+com.oracle.graal.jtt.lang.Class_getName01
+com.oracle.graal.hotspot.test.HotSpotMonitorValueTest
+com.oracle.graal.jtt.threads.Thread_getState02
+com.oracle.graal.jtt.except.BC_arraylength
+com.oracle.graal.jtt.bytecode.BC_caload
+com.oracle.graal.replacements.test.UnsafeSubstitutionsTest
+com.oracle.graal.jtt.bytecode.BC_saload
+com.oracle.graal.hotspot.test.HotSpotNmethodTest
+com.oracle.graal.replacements.test.DeoptimizeOnExceptionTest
+com.oracle.graal.jtt.optimize.ArrayCopyGeneric
+com.oracle.graal.jtt.lang.Class_forName01
+com.oracle.graal.jtt.except.BC_monitorenter
+com.oracle.graal.jtt.except.Catch_Loop02
+com.oracle.graal.jtt.bytecode.BC_lastore
+com.oracle.graal.jtt.except.BC_getfield
+com.oracle.graal.jtt.except.BC_aaload1
+com.oracle.graal.jtt.except.BC_aaload0
+com.oracle.graal.jtt.except.BC_dastore
+com.oracle.graal.jtt.micro.VarArgs_char01
+com.oracle.graal.jtt.optimize.NCE_FlowSensitive05
+com.oracle.graal.jtt.optimize.NCE_FlowSensitive03
+com.oracle.graal.jtt.bytecode.BC_aaload_1
+com.oracle.graal.jtt.lang.Math_abs
+com.oracle.graal.hotspot.test.CompileTheWorldTest
+com.oracle.graal.jtt.micro.FloatingReads
+com.oracle.graal.jtt.except.BC_fastore
+com.oracle.graal.jtt.optimize.ArrayCopy05
+com.oracle.graal.jtt.bytecode.BC_aastore
+com.oracle.graal.compiler.test.LockEliminationTest
+com.oracle.graal.jtt.hotpath.HP_invoke01
+com.oracle.graal.jtt.bytecode.BC_dastore
+com.oracle.graal.jtt.loop.DegeneratedLoop
+com.oracle.graal.jtt.hotpath.HP_array01
+com.oracle.graal.jtt.except.BC_iastore
+com.oracle.graal.jtt.except.BC_athrow2
+com.oracle.graal.jtt.except.BC_athrow0
+com.oracle.graal.jtt.except.BC_athrow1
+com.oracle.graal.jtt.micro.VarArgs_int01
+com.oracle.graal.jtt.micro.BigVirtualParams01
+com.oracle.graal.jtt.jdk.Class_getName
+com.oracle.graal.jtt.reflect.Array_newInstance05
+com.oracle.graal.jtt.optimize.ABCE_01
+com.oracle.graal.jtt.micro.InvokeVirtual_01
+com.oracle.graal.jtt.except.StackTrace_AIOOBE_00
+com.oracle.graal.jtt.bytecode.BC_invokeinterface
+com.oracle.graal.jtt.micro.BigMixedParams04
+com.oracle.graal.jtt.reflect.Invoke_main02
+com.oracle.graal.jtt.threads.Object_wait02
+com.oracle.graal.jtt.threads.Object_wait03
+com.oracle.graal.jtt.threads.Object_wait04
+com.oracle.graal.jtt.except.Catch_Unresolved02
+com.oracle.graal.jtt.except.Catch_Unresolved03
+com.oracle.graal.compiler.test.CheckGraalInvariants
+com.oracle.graal.jtt.except.Catch_Unresolved01
+com.oracle.graal.jtt.optimize.Narrow_byte03
+com.oracle.graal.jtt.except.BC_faload
+com.oracle.graal.nodes.test.LoopPhiCanonicalizerTest
+com.oracle.graal.jtt.bytecode.BC_f2i02
+com.oracle.graal.jtt.bytecode.BC_iaload
+com.oracle.graal.jtt.reflect.Array_set03
+com.oracle.graal.jtt.lang.Class_forName02
+com.oracle.graal.compiler.hsail.test.lambda.ObjectArrayInstanceTest
+com.oracle.graal.jtt.micro.VarArgs_boolean01
+com.oracle.graal.jtt.lang.Math_log
+com.oracle.graal.compiler.test.FlowSensitiveReductionTest
+com.oracle.graal.jtt.bytecode.BC_faload
+com.oracle.graal.jtt.bytecode.BC_multianewarray03
+com.oracle.graal.jtt.loop.Loop06
+com.oracle.graal.jtt.loop.Loop07
+com.oracle.graal.jtt.loop.Loop13
+com.oracle.graal.jtt.bytecode.BC_bastore
+com.oracle.graal.jtt.except.Catch_Two02
+com.oracle.graal.jtt.except.Catch_Two03
+com.oracle.graal.jtt.except.Catch_Two01
+com.oracle.graal.jtt.optimize.Narrow_byte02
+com.oracle.graal.jtt.loop.Loop05
+com.oracle.graal.jtt.loop.Loop12
+com.oracle.graal.jtt.jdk.System_setOut
+com.oracle.graal.jtt.except.Catch_Loop03
+com.oracle.graal.jtt.micro.BC_invokevirtual2
+com.oracle.graal.jtt.optimize.Narrow_char03
+com.oracle.graal.jtt.optimize.ArrayCopy02
+com.oracle.graal.jtt.optimize.ArrayCopy04
+com.oracle.graal.jtt.optimize.ArrayCopy06
+com.oracle.graal.replacements.test.NewArrayTest
+com.oracle.graal.jtt.optimize.ArrayCopy03