Эх сурвалжийг харах

Skip some tests on ruby:slim, improve alias logic

Joe Ferguson 10 жил өмнө
parent
commit
5e65bd2da3
2 өөрчлөгдсөн 7 нэмэгдсэн , 1 устгасан
  1. 2 0
      test/config.sh
  2. 5 1
      test/run.sh

+ 2 - 0
test/config.sh

@@ -30,4 +30,6 @@ declare -A imageTests=(
 
 declare -A globalExcludeTests=(
 	[hello-world_utc]=1
+	[ruby:slim_ruby-gems]=1
+	[ruby:slim_ruby-bundler]=1
 )

+ 5 - 1
test/run.sh

@@ -65,6 +65,10 @@ for dockerImage in "$@"; do
 	# TODO use the argTests as the definitive list of available tests
 	tests=( "${globalTests[@]}" ${imageTests[$testRepo]} ${imageTests[$testRepo:$variant]} )
 	
+	if [ "$testRepo" != "$repo" ]; then
+		tests+=( ${imageTests[$repo]} ${imageTests[$repo:$variant]} )
+	fi
+	
 	failures=0
 	currentTest=0
 	totalTest="${#tests[@]}"
@@ -72,7 +76,7 @@ for dockerImage in "$@"; do
 		(( currentTest+=1 ))
 		echo -ne "\t'$t' [$currentTest/$totalTest]..."
 		
-		if [ ! -z "${globalExcludeTests[${testRepo}_$t]}" -o ! -z "${globalExcludeTests[${testRepo}:${variant}_$t]}" ]; then
+		if [ ! -z "${globalExcludeTests[${testRepo}_$t]}" -o ! -z "${globalExcludeTests[${testRepo}:${variant}_$t]}" -o ! -z "${globalExcludeTests[${repo}_$t]}" -o ! -z "${globalExcludeTests[${repo}:${variant}_$t]}" ]; then
 			echo 'skipping'
 			continue
 		fi