Merge pull request #475 in G/truffleruby from sulong/backtrace-test to master

* commit 'd8f8ac0e711915e6bf7d2a10e8dc1d35842238ee':
  Ignore line numbers from Sulong libraries in backtrace test.

Author: nirvdrum

test/truffle/cexts/backtraces/bin/backtraces

@@ -7,7 +7,7 @@ TEST_DIR = File.expand_path("../..", __FILE__)
 def puts_backtrace(backtrace)
   puts backtrace.gsub(TEST_DIR, '')
                 .gsub(Truffle::Boot.ruby_home, '')
-                .gsub(/\/(cext\.rb|cext_ruby\.rb|ruby\.c):(\d+)/, '/\1:n')
+                .gsub(/\/(cext\.rb|cext_ruby\.rb|ruby\.c|qsort\.c):(\d+:)?/, '/\1:n:')
                 .gsub(/@\h+/, '@HEXA')
                 .gsub(/\{id: \d+ name: [^}]+}/, 'BLOCKINFO')
 end

test/truffle/cexts/backtraces/expected.txt

@@ -41,8 +41,8 @@ Test error in the callback to the Sulong-instrinsified qsort()
 	from /lib/truffle/truffle/cext.rb:n:in `__send__'
 	from /lib/truffle/truffle/cext.rb:n:in `rb_funcall'
 	from /ext/backtraces/backtraces.c:17:in `compare_function'
-	from com.oracle.truffle.llvm.libraries.bitcode/src/qsort.c:in `sulong_qsort'
-	from com.oracle.truffle.llvm.libraries.bitcode/src/qsort.c:in `qsort'
+	from com.oracle.truffle.llvm.libraries.bitcode/src/qsort.c:n:in `sulong_qsort'
+	from com.oracle.truffle.llvm.libraries.bitcode/src/qsort.c:n:in `qsort'
 	from /ext/backtraces/backtraces.c:25:in `call_qsort'
 	from /lib/truffle/truffle/cext.rb:n:in `execute_without_conversion'
 	from /lib/truffle/truffle/cext.rb:n:in `execute_with_mutex'