Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db80ada195ea
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70086fae87a2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 8, 2015

  1. [Truffle] Always pass an argument array. 

    * Allows to pass args containing spaces.
    @eregon
    eregon committed Jan 8, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b52853d View commit details

  2. [Truffle] JT: Allow arbitrary extra args for MSpec. 

    * For instance:
  $ jt test spec/ruby/language/def_spec.rb -fp
  for choosing the profiler output.
* Finer-grained than jt CMD *ARGS -- *ARBITRARY_ARGS and
  avoids clashes when there are multiple commands.
    @eregon
    eregon committed Jan 8, 2015
    Copy the full SHA
    70086fa View commit details
Showing with 8 additions and 8 deletions.
  1. +8 −8 tool/jt.rb
16 changes: 8 additions & 8 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ module ShellUtils
private

def sh(*args)
system args.join(' ')
system(*args)
raise "failed" unless $? == 0
end

@@ -60,32 +60,32 @@ def rebuild
build
end

def test(path=nil)
def test(path=nil, *args)
if path == nil
mspec 'run', '--excl-tag', 'fails', ':language', ':core'
mspec 'run', '--excl-tag', 'fails', ':language', ':core', *args
elsif path.start_with? 'spec/ruby'
mspec 'run', '--excl-tag', 'fails', path
mspec 'run', '--excl-tag', 'fails', path, *args
else
raise ArgumentError, "don't know how to test #{path}"
end
end

def tag(path)
mspec 'tag', '--add', 'fails', '--fail', path
mspec 'tag', '--add', 'fails', '--fail', path, *args
end

def untag(path)
puts
puts "WARNING: untag is currently not very reliable - run `jt test #{path}` after and manually annotate any new failures"
puts
mspec 'tag', '--del', 'fails', '--pass', path
mspec 'tag', '--del', 'fails', '--pass', path, *args
end

def findbugs(report=nil)
case report
when "report"
sh 'tool/truffle-findbugs.sh --report' rescue nil
sh 'open truffle-findbugs-report.html' rescue nil
sh 'tool/truffle-findbugs.sh', '--report' rescue nil
sh 'open', 'truffle-findbugs-report.html' rescue nil
when nil
sh 'tool/truffle-findbugs.sh'
else