From cb93b6b3f03536ca833bde8d8d7a0018cf94927a Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 28 Apr 2017 18:22:11 +0300
Subject: Make tests to pass

---
 tests/common/hello/libhello-1.0.0.tar.gz    | Bin 2483 -> 2362 bytes
 tests/common/libhello-1.0.0/buildfile       |   7 ++++---
 tests/common/libhello-1.0.0/hello/buildfile |   6 +++---
 tests/common/libhello-1.0.0/manifest        |   2 +-
 tests/common/libhello-1.0.0/version         |   1 -
 tests/pkg-clean.test                        |   4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 tests/common/libhello-1.0.0/version

diff --git a/tests/common/hello/libhello-1.0.0.tar.gz b/tests/common/hello/libhello-1.0.0.tar.gz
index e9d9ff1..29341c7 100644
Binary files a/tests/common/hello/libhello-1.0.0.tar.gz and b/tests/common/hello/libhello-1.0.0.tar.gz differ
diff --git a/tests/common/libhello-1.0.0/buildfile b/tests/common/libhello-1.0.0/buildfile
index a416648..57e0f35 100644
--- a/tests/common/libhello-1.0.0/buildfile
+++ b/tests/common/libhello-1.0.0/buildfile
@@ -1,6 +1,7 @@
-d = hello/ tests/
-./: $d doc{INSTALL version} file{manifest}
-include $d
+./: hello/ tests/ doc{INSTALL version} file{manifest}
+
+doc{version}: file{manifest} # Generated by the version module.
+doc{version}: dist = true
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/tests/common/libhello-1.0.0/hello/buildfile b/tests/common/libhello-1.0.0/hello/buildfile
index bff7fce..9af86cf 100644
--- a/tests/common/libhello-1.0.0/hello/buildfile
+++ b/tests/common/libhello-1.0.0/hello/buildfile
@@ -3,10 +3,10 @@ lib{hello}: {hxx cxx}{hello} hxx{export}
 # For pre-releases use the complete version to make sure they cannot be used
 # in place of another pre-release or the final version.
 #
-if $abi_prerelease
-  lib{hello}: bin.lib.version = @-$version
+if $version.pre_release
+  lib{hello}: bin.lib.version = @"-$version.project_id"
 else
-  lib{hello}: bin.lib.version = @-$abi_major.$abi_minor
+  lib{hello}: bin.lib.version = @"-$version.major.$version.minor"
 
 cxx.poptions += "-I$src_root"
 obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
diff --git a/tests/common/libhello-1.0.0/manifest b/tests/common/libhello-1.0.0/manifest
index 75dc91b..d7d43a7 100644
--- a/tests/common/libhello-1.0.0/manifest
+++ b/tests/common/libhello-1.0.0/manifest
@@ -11,4 +11,4 @@ goal is to show a canonical build2/bpkg project/package.
 url: http://www.example.org/libhello
 email: hello-users@example.org
 requires: c++11
-requires: build2 >= 0.4.0
+depends: * build2 >= 0.5.0-
diff --git a/tests/common/libhello-1.0.0/version b/tests/common/libhello-1.0.0/version
deleted file mode 100644
index 3eefcb9..0000000
--- a/tests/common/libhello-1.0.0/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.0
diff --git a/tests/pkg-clean.test b/tests/pkg-clean.test
index a853372..18c2a79 100644
--- a/tests/pkg-clean.test
+++ b/tests/pkg-clean.test
@@ -97,7 +97,7 @@ $* 2>>EOE != 0
     $pkg_configure libhello       && $pkg_update libhello;
 
     $* libhello 2>>~%EOE%;
-      %.{6}
+      %.{7}
       cleaned libhello/1.0.0
       EOE
 
@@ -119,7 +119,7 @@ $* 2>>EOE != 0
   $pkg_configure libhello && $pkg_update libhello;
 
   $* libhello 2>>~%EOE%;
-    %.{8}
+    %.{9}
     cleaned libhello/1.0.0
     EOE
 
-- 
cgit v1.1