From 5007870b52aa549971824959a55ad3bb886f09e0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Sep 2018 16:37:32 +0200 Subject: Rename .test/test{} to .testscript/testscript{} --- tests/test/script/integration/testscript | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/test/script/integration/testscript') diff --git a/tests/test/script/integration/testscript b/tests/test/script/integration/testscript index 7176e0e..7bdad54 100644 --- a/tests/test/script/integration/testscript +++ b/tests/test/script/integration/testscript @@ -2,19 +2,19 @@ # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -# Note: using common.test from test/, not script/. +# Note: using common.testscript from test/, not script/. # -.include ../../common.test +.include ../../common.testscript : script-files : { - +touch testscript foo.test bar.test + +touch testscript foo.testscript bar.testscript : testscript-and-other : $* <>/EOE != 0 - ./: ../testscript test{../foo} + ./: ../testscript testscript{../foo} EOI error: both 'testscript' and other names specified for dir{./} EOE @@ -22,7 +22,7 @@ : other-and-testscript : $* <>/EOE != 0 - ./: test{../foo} ../testscript + ./: testscript{../foo} ../testscript EOI error: both 'testscript' and other names specified for dir{./} EOE @@ -30,7 +30,7 @@ : others : $* <>~%EOE% != 0 -./: test{foo} +./: testscript{foo} EOI %error: working directory test[/\\] is a file/symlink% EOE : wd-exists-before : -touch foo.test; +touch foo.testscript; mkdir test &!test/; $* <>/EOE -./: test{foo} +./: testscript{foo} EOI warning: working directory test/ exists at the beginning of the test EOE : wd-not-empty-before : -touch foo.test; +touch foo.testscript; mkdir test &!test/; touch test/dummy &!test/dummy; $* <>/EOE -./: test{foo} +./: testscript{foo} EOI warning: working directory test/ exists and is not empty at the beginning of the test EOE @@ -76,11 +76,11 @@ EOE : scope. Also note that we still have to remove everything after detecting the : failure. : -cat <=foo.test; +cat <=foo.testscript; touch ../../dummy EOI $* <>/EOE &test/*** != 0 -./: test{foo} +./: testscript{foo} EOI error: working directory test/ is not empty at the end of the test EOE -- cgit v1.1