aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-06-01 20:31:24 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-06-01 20:31:24 +0300
commitb58bae8cd52ca7df3a77b1ce5c8db2ca9314094e (patch)
treef83087803464ab59bf4c7322615276f7d6f60449
parente4d2d772de35fe9d2ba9f40156e8091935d7d8fa (diff)
Remove target/scope irregularity workarounds
-rw-r--r--buildfile6
-rw-r--r--tests/agent/buildfile2
-rw-r--r--tests/integration/buildfile2
-rw-r--r--tests/machine/buildfile2
-rw-r--r--tests/worker/buildfile2
5 files changed, 7 insertions, 7 deletions
diff --git a/buildfile b/buildfile
index 6b7ff6f..d1733fd 100644
--- a/buildfile
+++ b/buildfile
@@ -6,6 +6,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/agent/buildfile b/tests/agent/buildfile
index 87ead00..90231d2 100644
--- a/tests/agent/buildfile
+++ b/tests/agent/buildfile
@@ -7,4 +7,4 @@
import agent = bbot%exe{bbot-agent}
./: testscript file{btrfs-*} $agent
-dir{./}: test = $agent
+./: test = $agent
diff --git a/tests/integration/buildfile b/tests/integration/buildfile
index c49a61e..d06519c 100644
--- a/tests/integration/buildfile
+++ b/tests/integration/buildfile
@@ -8,4 +8,4 @@ import agent = bbot%exe{bbot-agent}
import worker = bbot%exe{bbot-worker}
./: testscript file{tftp-map} $agent $worker
-dir{./}: test = $agent
+./: test = $agent
diff --git a/tests/machine/buildfile b/tests/machine/buildfile
index 6d131b1..cdbb0b0 100644
--- a/tests/machine/buildfile
+++ b/tests/machine/buildfile
@@ -7,4 +7,4 @@
import agent = bbot%exe{bbot-agent}
./: testscript $agent
-dir{./}: test = $agent
+./: test = $agent
diff --git a/tests/worker/buildfile b/tests/worker/buildfile
index 4004b41..5483c51 100644
--- a/tests/worker/buildfile
+++ b/tests/worker/buildfile
@@ -25,4 +25,4 @@ sudo /usr/sbin/in.tftpd \
import worker = bbot%exe{bbot-worker}
./: test{*} $worker
-dir{./}: test = $worker
+./: test = $worker