diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-05-24 07:38:21 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-05-24 07:38:21 +0200 |
| commit | 756054785a425e235f78ac7681b812ec693aa775 (patch) | |
| tree | 8a50f075969383dfd4bd3c452aadd43fcf59e580 | |
| parent | c2a7f5db75ca002fdd3f2ca88542599523da5ee1 (diff) | |
Remove target/scope irregularity workarounds
| -rw-r--r-- | buildfile | 6 | ||||
| -rw-r--r-- | tests/search/dir/testscript | 2 | ||||
| -rw-r--r-- | tests/test/simple/generated/testscript | 4 | ||||
| -rw-r--r-- | tests/variable/target-specific/testscript | 3 |
4 files changed, 7 insertions, 8 deletions
@@ -8,6 +8,6 @@ # Don't install tests or the INSTALL file. # -dir{tests/}: install = false -dir{unit-tests/}: install = false -doc{INSTALL}@./: install = false +tests/: install = false +unit-tests/: install = false +doc{INSTALL}@./: install = false diff --git a/tests/search/dir/testscript b/tests/search/dir/testscript index 71add0b..24162d7 100644 --- a/tests/search/dir/testscript +++ b/tests/search/dir/testscript @@ -37,7 +37,7 @@ EOI : existing-target-implied : $* <<EOI >'bar' -dir{bar/}: x = y # @@ TMP +bar/: x = y ./: bar/ EOI diff --git a/tests/test/simple/generated/testscript b/tests/test/simple/generated/testscript index 63200f7..61258b0 100644 --- a/tests/test/simple/generated/testscript +++ b/tests/test/simple/generated/testscript @@ -27,7 +27,7 @@ EOI ln -s $src_base/input.in ./; $* <<EOI driver = $src_root/../exe{driver} -dir{./}: test = $driver # @@ TMP (target/scope regularity) +./: test = $driver ./: $driver ./: file{input}: test.input = true file{input}: in{input} $src_root/manifest #@@ in module @@ -38,7 +38,7 @@ EOI ln -s $src_base/output.in ./; $* <<EOI driver = $src_root/../exe{driver} -dir{./}: test = $driver # @@ TMP (target/scope regularity) +./: test = $driver ./: $driver ./: file{output}: test.stdout = true file{output}: in{output} $src_root/manifest #@@ in module diff --git a/tests/variable/target-specific/testscript b/tests/variable/target-specific/testscript index 64ca0b6..8d9917c 100644 --- a/tests/variable/target-specific/testscript +++ b/tests/variable/target-specific/testscript @@ -8,8 +8,7 @@ : $* <<EOI >>EOO x = x -#./: x = X @@ TMP -dir{./}: x = X +./: x = X file{foo}: [uint64] y=00 sub/ { |