17 files changed, 17 insertions, 17 deletions
diff --git a/tests/cc/libu/buildfile b/tests/cc/libu/buildfile
index 104a645..e7efc2a 100644
--- a/tests/cc/libu/buildfile
+++ b/tests/cc/libu/buildfile
@@ -5,4 +5,4 @@
 # Test utility library support.
 #
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/cc/modules/buildfile b/tests/cc/modules/buildfile
index 58caf92..b83d549 100644
--- a/tests/cc/modules/buildfile
+++ b/tests/cc/modules/buildfile
@@ -5,4 +5,4 @@
 # Test C++ modules support.
 #
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/cc/preprocessed/buildfile b/tests/cc/preprocessed/buildfile
index ac6bcdf..bb5d6ab 100644
--- a/tests/cc/preprocessed/buildfile
+++ b/tests/cc/preprocessed/buildfile
@@ -5,4 +5,4 @@
 # Test {c, cxx}.preprocessed logic.
 #
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/function/builtin/buildfile b/tests/function/builtin/buildfile
index 0c38e38..903860b 100644
--- a/tests/function/builtin/buildfile
+++ b/tests/function/builtin/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/function/filesystem/buildfile b/tests/function/filesystem/buildfile
index ade9a68..b41344f 100644
--- a/tests/function/filesystem/buildfile
+++ b/tests/function/filesystem/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/function/install/buildfile b/tests/function/install/buildfile
index 356ca77..afc729f 100644
--- a/tests/function/install/buildfile
+++ b/tests/function/install/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/function/path/buildfile b/tests/function/path/buildfile
index 5c2ede2..b6fb6b2 100644
--- a/tests/function/path/buildfile
+++ b/tests/function/path/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/function/regex/buildfile b/tests/function/regex/buildfile
index fbac223..b63f64a 100644
--- a/tests/function/regex/buildfile
+++ b/tests/function/regex/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/search/dir/buildfile b/tests/search/dir/buildfile
index 03afc85..07c2f3e 100644
--- a/tests/search/dir/buildfile
+++ b/tests/search/dir/buildfile
@@ -5,4 +5,4 @@
 # Test loading of dir{} buildfiles during target search.
 #
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/test/config-test/buildfile b/tests/test/config-test/buildfile
index d86914f..909f8f2 100644
--- a/tests/test/config-test/buildfile
+++ b/tests/test/config-test/buildfile
@@ -5,6 +5,6 @@
 # Test config.test.
 #
 
-./: test{testscript} exe{driver} $b
+./: testscript exe{driver} $b
 
 exe{driver}: {hxx cxx}{*}
diff --git a/tests/test/script/generated/buildfile b/tests/test/script/generated/buildfile
index 524be44..6922afc 100644
--- a/tests/test/script/generated/buildfile
+++ b/tests/test/script/generated/buildfile
@@ -5,4 +5,4 @@
 # Test generated testscripts.
 #
 
-./: test{testscript} $b file{*.in}
+./: testscript $b file{*.in}
diff --git a/tests/test/script/integration/buildfile b/tests/test/script/integration/buildfile
index 1cc1e30..f3cfb65 100644
--- a/tests/test/script/integration/buildfile
+++ b/tests/test/script/integration/buildfile
@@ -5,4 +5,4 @@
 # Test integration of testscript into build system.
 #
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/test/simple/generated/buildfile b/tests/test/simple/generated/buildfile
index 2d795a8..1ff8396 100644
--- a/tests/test/simple/generated/buildfile
+++ b/tests/test/simple/generated/buildfile
@@ -5,6 +5,6 @@
 # Test generated test inputs/outputs.
 #
 
-./: test{testscript} exe{driver} $b file{*.in}
+./: testscript exe{driver} $b file{*.in}
 
 exe{driver}: cxx{driver}
diff --git a/tests/variable/override/buildfile b/tests/variable/override/buildfile
index 5831ecd..6cd339f 100644
--- a/tests/variable/override/buildfile
+++ b/tests/variable/override/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/variable/prerequisite-specific/buildfile b/tests/variable/prerequisite-specific/buildfile
index e16519c..dc017c1 100644
--- a/tests/variable/prerequisite-specific/buildfile
+++ b/tests/variable/prerequisite-specific/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/variable/scope-specific/buildfile b/tests/variable/scope-specific/buildfile
index 2f3de77..81a8158 100644
--- a/tests/variable/scope-specific/buildfile
+++ b/tests/variable/scope-specific/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b
diff --git a/tests/variable/target-specific/buildfile b/tests/variable/target-specific/buildfile
index 5a8178b..5ae03b0 100644
--- a/tests/variable/target-specific/buildfile
+++ b/tests/variable/target-specific/buildfile
@@ -2,4 +2,4 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-./: test{testscript} $b
+./: testscript $b