aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-05-19 14:56:20 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-05-19 16:00:56 +0300
commit0de5118f54606c5654ef2c2148e49f6f14713f88 (patch)
tree02766421d8e2fd710b9f9d8d4bfeda530080a6db /tests
parent03cf736329b821bf90edcf8c0c1add61008ef858 (diff)
Get rid of doc{version} and types for testscript and manifest in buildfiles
Diffstat (limited to 'tests')
-rw-r--r--tests/common/hello/libhello-1.0.0.tar.gzbin2445 -> 2412 bytes
-rw-r--r--tests/common/libhello-1.0.0/buildfile5
-rw-r--r--tests/pkg-build.test2
-rw-r--r--tests/pkg-clean.test4
4 files changed, 4 insertions, 7 deletions
diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz
index 24d661a..18ddb08 100644
--- a/tests/common/hello/libhello-1.0.0.tar.gz
+++ b/tests/common/hello/libhello-1.0.0.tar.gz
Binary files differ
diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile
index b3ad7e3..8a79aa1 100644
--- a/tests/common/libhello-1.0.0/buildfile
+++ b/tests/common/libhello-1.0.0/buildfile
@@ -1,7 +1,4 @@
-./: libhello/ tests/ doc{INSTALL version} file{manifest}
-
-doc{version}: file{manifest} # Generated by the version module.
-doc{version}: dist = true
+./: libhello/ tests/ doc{INSTALL} manifest
# Don't install tests or the INSTALL file.
#
diff --git a/tests/pkg-build.test b/tests/pkg-build.test
index 9c9aee9..a44b45a 100644
--- a/tests/pkg-build.test
+++ b/tests/pkg-build.test
@@ -3220,7 +3220,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>!
+$build 'dist(../../libhello/@./out/)' \
"config.cxx=$config.cxx" config.dist.root=./ \
config.dist.archives=tar.gz 2>! \
- &out/*** &libhello-1.0.1/*** &libhello-1.0.1.tar.gz
+ &libhello-1.0.1/*** &libhello-1.0.1.tar.gz
: arg
:
diff --git a/tests/pkg-clean.test b/tests/pkg-clean.test
index a76c1e6..80b077b 100644
--- a/tests/pkg-clean.test
+++ b/tests/pkg-clean.test
@@ -100,7 +100,7 @@ $* 2>>EOE != 0
$pkg_configure libhello && $pkg_update libhello;
$* libhello 2>>~%EOE%;
- %.{7}
+ %.{6}
cleaned libhello/1.0.0
EOE
@@ -122,7 +122,7 @@ $* 2>>EOE != 0
$pkg_configure libhello && $pkg_update libhello;
$* libhello 2>>~%EOE%;
- %.{9}
+ %.{8}
cleaned libhello/1.0.0
EOE