From b37f1aa6398065be806e6605a023189685669885 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 15 Feb 2017 03:55:15 +0200
Subject: Implement parallel match

---
 tests/common.test                      | 2 +-
 tests/search/dir/testscript            | 1 -
 tests/test/common.test                 | 2 +-
 tests/test/config-test/testscript      | 2 +-
 tests/test/script/common.test          | 2 +-
 tests/test/script/runner/redirect.test | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/common.test b/tests/common.test
index 250948e..b8d6148 100644
--- a/tests/common.test
+++ b/tests/common.test
@@ -11,7 +11,7 @@ project = test
 amalgamation =
 EOI
 
-test.options += --jobs 1 --quiet --buildfile -
+test.options += --serial-stop --quiet --buildfile -
 
 # By default just load the buildfile.
 #
diff --git a/tests/search/dir/testscript b/tests/search/dir/testscript
index 49c964e..d580c4f 100644
--- a/tests/search/dir/testscript
+++ b/tests/search/dir/testscript
@@ -22,7 +22,6 @@ EOI
 $* <'./: foo/' 2>>/EOE != 0
 error: no explicit target for prerequisite ../:dir{foo/}
   info: did you forget to include the corresponding buildfile?
-info: while applying rule alias to update dir{../}
 EOE
 
 : basic
diff --git a/tests/test/common.test b/tests/test/common.test
index 7e3aa67..fc3cf9f 100644
--- a/tests/test/common.test
+++ b/tests/test/common.test
@@ -20,7 +20,7 @@ if ($null($test.options))
   test.options = --buildfile -
 end
 
-test.options += --jobs 1 --quiet
+test.options += --serial-stop --quiet
 
 # By default perform test.
 #
diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript
index 833a33a..d918a3b 100644
--- a/tests/test/config-test/testscript
+++ b/tests/test/config-test/testscript
@@ -5,7 +5,7 @@
 # Setup a realistic test project that we will then exercise.
 #
 
-test.options   = --jobs 1 --quiet
+test.options   = --serial-stop --quiet
 test.arguments = 'test(../proj/@./)' # Test out-of-src (for parallel).
 test.cleanups  = &**/                # Cleanup out directory structure.
 
diff --git a/tests/test/script/common.test b/tests/test/script/common.test
index 781be30..cc93a8d 100644
--- a/tests/test/script/common.test
+++ b/tests/test/script/common.test
@@ -32,5 +32,5 @@ end
 # automatically becoming dir{./}'s prerequisite.
 #
 c = cat >=testscript
-b = $0 --jobs 1 --quiet --buildfile - test <"'test{testscript}: \$target'" \
+b = $0 --serial-stop --quiet --buildfile - test <"'test{testscript}: \$target'" \
 &?test/***
diff --git a/tests/test/script/runner/redirect.test b/tests/test/script/runner/redirect.test
index b316011..4e0bc69 100644
--- a/tests/test/script/runner/redirect.test
+++ b/tests/test/script/runner/redirect.test
@@ -16,7 +16,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
   cat <<EOI >=buildfile;
   test{testscript}: $target
   EOI
-  $0 --jobs 1 --quiet test <foo >foo 2>bar
+  $0 --serial-stop --quiet test <foo >foo 2>bar
 }
 
 : null
-- 
cgit v1.1