From 3fce45aadf75d5d5e1f9fea19f5a1bf04726ab68 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 May 2018 19:18:48 +0300
Subject: Fix testscripts using types for testscript and manifest targets

---
 tests/test/config-test/testscript        | 4 ++--
 tests/test/script/generated/testscript   | 6 +++---
 tests/test/script/integration/testscript | 4 ++--
 tests/test/simple/generated/testscript   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript
index 0561a59..1c540ea 100644
--- a/tests/test/config-test/testscript
+++ b/tests/test/config-test/testscript
@@ -65,7 +65,7 @@ EOI
 #
 +cat <<EOI >=proj/units/buildfile
 d = simple/ script/
-./: $d test{testscript}
+./: $d testscript
 #include $d
 EOI
 +cat <<EOI >=proj/units/testscript
@@ -92,7 +92,7 @@ EOI
 #
 +mkdir proj/units/script
 +cat <<EOI >=proj/units/script/buildfile
-./: test{testscript}
+./: testscript
 EOI
 +cat <<EOI >=proj/units/script/testscript
 echo 'units/script/foo' >| : foo
diff --git a/tests/test/script/generated/testscript b/tests/test/script/generated/testscript
index 8b9d2ab..8153104 100644
--- a/tests/test/script/generated/testscript
+++ b/tests/test/script/generated/testscript
@@ -23,7 +23,7 @@ EOI
 :
 ln -s $src_base/testscript.in ./;
 $* <<EOI
-./: test{testscript}
-test{testscript}: in{testscript} $src_root/file{manifest} #@@ in module
-test{testscript}: in.symbol = '@'
+./: testscript
+testscript: in{testscript} $src_root/manifest #@@ in module
+testscript: in.symbol = '@'
 EOI
diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript
index 7074e36..e7abebe 100644
--- a/tests/test/script/integration/testscript
+++ b/tests/test/script/integration/testscript
@@ -14,7 +14,7 @@
   : testscript-and-other
   :
   $* <<EOI 2>>/EOE != 0
-  ./: test{../testscript ../foo}
+  ./: ../testscript test{../foo}
   EOI
   error: both 'testscript' and other names specified for dir{./}
   EOE
@@ -22,7 +22,7 @@
   : other-and-testscript
   :
   $* <<EOI 2>>/EOE != 0
-  ./: test{../foo ../testscript}
+  ./: test{../foo} ../testscript
   EOI
   error: both 'testscript' and other names specified for dir{./}
   EOE
diff --git a/tests/test/simple/generated/testscript b/tests/test/simple/generated/testscript
index f7ab8d6..4590466 100644
--- a/tests/test/simple/generated/testscript
+++ b/tests/test/simple/generated/testscript
@@ -30,7 +30,7 @@ driver = $src_root/../exe{driver}
 dir{./}: test = $driver # @@ TMP (target/scope regularity)
 ./: $driver
 ./: file{input}: test.input = true
-file{input}: in{input} $src_root/file{manifest} #@@ in module
+file{input}: in{input} $src_root/manifest #@@ in module
 EOI
 
 : output
@@ -41,5 +41,5 @@ driver = $src_root/../exe{driver}
 dir{./}: test = $driver # @@ TMP (target/scope regularity)
 ./: $driver
 ./: file{output}: test.stdout = true
-file{output}: in{output} $src_root/file{manifest} #@@ in module
+file{output}: in{output} $src_root/manifest #@@ in module
 EOI
-- 
cgit v1.1