[Truffle] build/rebuild --no-tests to skip slow TCK tests

jruby · Nov 22, 2015 · e5ab686 · e5ab686
1 parent e2e862c
commit e5ab686
Showing 1 changed file with 29 additions and 20 deletions.
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -181,11 +181,12 @@ module Commands
   include ShellUtils
 
   def help
-    puts 'jt build                                       build'
-    puts 'jt build truffle                               build only the Truffle part, assumes the rest is up-to-date'
+    puts 'jt build [options]                             build'
+    puts 'jt build truffle [options]                     build only the Truffle part, assumes the rest is up-to-date'
+    puts 'jt rebuild [options]                           clean and build'
+    puts '    --no-tests       don\'t run JUnit unit tests'
     puts 'jt clean                                       clean'
     puts 'jt irb                                         irb'
-    puts 'jt rebuild                                     clean and build'
     puts 'jt run [options] args...                       run JRuby with -X+T and args'
     puts '    --graal         use Graal (set GRAAL_BIN or it will try to automagically find it)'
     puts '    --asm           show assembly (implies --graal)'
@@ -226,15 +227,22 @@ def help
     puts '           branch names are mangled - eg truffle-head becomes GRAAL_BIN_TRUFFLE_HEAD'
   end
 
-  def build(project = nil)
-    case project
-    when 'truffle'
-      mvn '-pl', 'truffle', 'package'
-    when nil
-      mvn 'package'
-    else
-      raise ArgumentError, project
+  def build(*args)
+    mvn_args = []
+
+    if args.delete 'truffle'
+      mvn_args += ['-pl', 'truffle', 'package']
     end
+
+    if args.delete '--no-tests'
+      mvn_args << '-DskipTests'
+    end
+
+    unless args.empty?
+      raise ArgumentError, args.inspect
+    end
+
+    mvn *mvn_args
   end
 
   def clean
@@ -245,9 +253,9 @@ def irb(*args)
     run(*%w[-S irb], *args)
   end
 
-  def rebuild
+  def rebuild(*args)
     clean
-    build
+    build *args
   end
 
   def run(*args)
@@ -514,13 +522,14 @@ def main(args)
       exit
     end
 
-    case args.first
-    when "rebuild"
-      send(args.shift)
-    when "build"
-      command = [args.shift]
-      command << args.shift if args.first == "truffle"
-      send(*command)
+    if ['build', 'rebuild'].include? args.first
+      build_args = [args.shift]
+
+      while ['truffle', '--no-tests'].include? args.first
+        build_args << args.shift
+      end
+
+      send(*build_args)
     end
 
     return if args.empty?