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/script/generated/testscript   | 6 +++---
 tests/test/script/integration/testscript | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/test/script')

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
-- 
cgit v1.1