From 9267edea8da62febc1979129b3519c31f208d858 Mon Sep 17 00:00:00 2001 From: Dmitry Moskalchuk Date: Mon, 15 Jun 2015 23:25:26 +0300 Subject: [PATCH] [run-boost-tests] Fix bug #966 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 --- tests/run-boost-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run-boost-tests b/tests/run-boost-tests index 042a862bc..b44235857 100755 --- a/tests/run-boost-tests +++ b/tests/run-boost-tests @@ -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