Skip to content

Commit

Permalink
[run-boost-tests] Fix bug #966
Browse files Browse the repository at this point in the history
Toolchain versions were improperly detected; 'renderscript' was added as one of
toolchain versions. Now, we select only those toolchains which contains
'config.mk' and 'setup.mk'.

Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
  • Loading branch information
dmsck committed Jun 15, 2015
1 parent fd4370b commit 9267ede
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/run-boost-tests
Expand Up @@ -168,10 +168,10 @@ By default, this will try with the current NDK directory, unless you use the --n
end

OPTIONS[:toolchain_versions] = Dir.glob(File.join(OPTIONS[:ndk], 'toolchains', '*')).select do |e|
File.directory?(e)
File.directory?(e) && File.exists?(File.join(e, 'setup.mk')) && File.exists?(File.join(e, 'config.mk'))
end.map { |e| File.basename(e) }.reject { |e| e =~ /^llvm\b/ }.map do |e|
e.sub(/^.*-([^-]+)$/, '\1')
end.sort.uniq.map { |e| e.sub(/^(\d)/, 'gcc\1') }
end.sort.uniq.map { |e| e.sub(/^(\d.*)$/, 'gcc\1') }.select { |e| e =~ /^(gcc|clang)/ }

o.on("--toolchain-versions=LIST", Array, "Toolchain versions [#{OPTIONS[:toolchain_versions].join(',')}]") do |l|
OPTIONS[:toolchain_versions] = l
Expand Down

0 comments on commit 9267ede

Please sign in to comment.