# HG changeset patch # User Christian Wimmer # Date 1330708870 28800 # Node ID c142a64141a82b0cfb199fca7921db482b7cbfc3 # Parent 7333fc50905db6bdb605ed4311fd3a70f84ad922 Reorder gate checks to do the important stuff first diff -r 7333fc50905d -r c142a64141a8 mx/commands.py --- a/mx/commands.py Fri Mar 02 09:20:28 2012 -0800 +++ b/mx/commands.py Fri Mar 02 09:21:10 2012 -0800 @@ -656,31 +656,10 @@ clean([] if args.buildNative else ['--no-native']) tasks.append(t.stop()) - t = Task('Checkstyle') - if mx.checkstyle([]) != 0: - t.abort('Checkstyle warnings were found') - tasks.append(t.stop()) - - t = Task('Canonicalization Check') - mx.log(time.strftime('%d %b %Y %H:%M:%S - Ensuring mx/projects files are canonicalized...')) - if mx.canonicalizeprojects([]) != 0: - t.abort('Rerun "mx canonicalizeprojects" and check-in the modified mx/projects files.') - tasks.append(t.stop()) - t = Task('BuildJava') build(['--no-native']) tasks.append(t.stop()) - t = Task('CleanAndBuildGraalVisualizer') - mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build']) - tasks.append(t.stop()) - - # Prevent Graal modifications from breaking the standard builds - if args.buildNative and args.buildNonGraal: - t = Task('BuildHotSpotVarieties') - buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) - tasks.append(t.stop()) - for vmbuild in ['fastdebug', 'product']: global _vmbuild _vmbuild = vmbuild @@ -707,6 +686,28 @@ if not test.test('graal'): t.abort(test.group + ' ' + test.name + ' Failed') tasks.append(t.stop()) + + t = Task('Checkstyle') + if mx.checkstyle([]) != 0: + t.abort('Checkstyle warnings were found') + tasks.append(t.stop()) + + t = Task('Canonicalization Check') + mx.log(time.strftime('%d %b %Y %H:%M:%S - Ensuring mx/projects files are canonicalized...')) + if mx.canonicalizeprojects([]) != 0: + t.abort('Rerun "mx canonicalizeprojects" and check-in the modified mx/projects files.') + tasks.append(t.stop()) + + t = Task('CleanAndBuildGraalVisualizer') + mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build']) + tasks.append(t.stop()) + + # Prevent Graal modifications from breaking the standard builds + if args.buildNative and args.buildNonGraal: + t = Task('BuildHotSpotVarieties') + buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) + tasks.append(t.stop()) + except KeyboardInterrupt: total.abort(1)