21 files changed, 82 insertions, 72 deletions
diff --git a/tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz b/tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz
new file mode 100644
index 0000000..eeff2a0
--- /dev/null
+++ b/tests/repository/1/common/hello/libhello-1.0.0+1.tar.gz
diff --git a/tests/repository/1/common/hello/libhello-1.0.0.tar.gz b/tests/repository/1/common/hello/libhello-1.0.0.tar.gz
deleted file mode 100644
index c1ada1e..0000000
--- a/tests/repository/1/common/hello/libhello-1.0.0.tar.gz
+++ /dev/null
diff --git a/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0+1/build/bootstrap.build
index 6f7d63b..c9bf24d 100644
--- a/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build
+++ b/tests/repository/1/common/libhello-1.0.0+1/build/bootstrap.build
@@ -1,8 +1,15 @@
 project = libhello
 version = 1.0.0
+revision = 1
+
 using config
 using dist
 using test
 using install
 
 dist.package = $project-$version
+
+if ($revision != 0)
+{
+  dist.package += +$revision
+}
diff --git a/tests/repository/1/common/libhello-1.0.0/build/export.build b/tests/repository/1/common/libhello-1.0.0+1/build/export.build
index 1eb73b7..1eb73b7 100644
--- a/tests/repository/1/common/libhello-1.0.0/build/export.build
+++ b/tests/repository/1/common/libhello-1.0.0+1/build/export.build
diff --git a/tests/repository/1/common/libhello-1.0.0/build/root.build b/tests/repository/1/common/libhello-1.0.0+1/build/root.build
index 1cf158c..ebe16d5 100644
--- a/tests/repository/1/common/libhello-1.0.0/build/root.build
+++ b/tests/repository/1/common/libhello-1.0.0+1/build/root.build
@@ -5,6 +5,6 @@ cxx{*}: extension = cxx
 
 cxx.std = 11
 
-# Don't try to install tests.
+# Don't install tests.
 #
 tests/: install = false
diff --git a/tests/repository/1/common/libhello-1.0.0+1/buildfile b/tests/repository/1/common/libhello-1.0.0+1/buildfile
new file mode 100644
index 0000000..f846f89
--- /dev/null
+++ b/tests/repository/1/common/libhello-1.0.0+1/buildfile
@@ -0,0 +1,3 @@
+d = hello/ tests/
+./: $d doc{version} file{manifest}
+include $d
diff --git a/tests/repository/1/common/libhello-1.0.0/hello/buildfile b/tests/repository/1/common/libhello-1.0.0+1/hello/buildfile
index cef703d..4903a33 100644
--- a/tests/repository/1/common/libhello-1.0.0/hello/buildfile
+++ b/tests/repository/1/common/libhello-1.0.0+1/hello/buildfile
@@ -1,4 +1,4 @@
-lib{hello}: cxx{hello} hxx{hello}
+lib{hello}: {hxx cxx}{hello}
 
 cxx.poptions += -I$src_root
 lib{hello}: cxx.export.poptions = -I$src_root
diff --git a/tests/repository/1/common/libhello-1.0.0+1/hello/hello b/tests/repository/1/common/libhello-1.0.0+1/hello/hello
new file mode 100644
index 0000000..4f85114
--- /dev/null
+++ b/tests/repository/1/common/libhello-1.0.0+1/hello/hello
@@ -0,0 +1,11 @@
+// file: hello/hello -*- C++ -*-
+
+#pragma once
+
+#include <string>
+
+namespace hello
+{
+  void
+  say (const std::string& name);
+}
diff --git a/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx b/tests/repository/1/common/libhello-1.0.0+1/hello/hello.cxx
index bba6649..65d0aa7 100644
--- a/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx
+++ b/tests/repository/1/common/libhello-1.0.0+1/hello/hello.cxx
@@ -9,7 +9,7 @@ using namespace std;
 namespace hello
 {
   void
-  say (const char* n)
+  say (const string& n)
   {
     cout << "Hello, " << n << '!' << endl;
   }
diff --git a/tests/repository/1/common/libhello-1.0.0+1/manifest b/tests/repository/1/common/libhello-1.0.0+1/manifest
new file mode 100644
index 0000000..82d79c8
--- /dev/null
+++ b/tests/repository/1/common/libhello-1.0.0+1/manifest
@@ -0,0 +1,13 @@
+: 1
+name: libhello
+version: 1.0.0+1
+summary: The "Hello World" example library
+license: MIT
+tags: c++, hello, world, example
+description: \
+A simple library that implements the "Hello World" example in C++. Its primary
+goal is to show a canonical build2/bpkg project/package.
+\
+url: http://www.example.org/libhello
+email: hello-users@example.org
+requires: c++11
diff --git a/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0+1/tests/build/bootstrap.build
index 1151b0c..2c2de24 100644
--- a/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build
+++ b/tests/repository/1/common/libhello-1.0.0+1/tests/build/bootstrap.build
@@ -1,4 +1,5 @@
-project = # Unnamed.
+project = # Unnamed subproject.
+
 using config
 using dist
 using test
diff --git a/tests/repository/1/common/libhello-1.0.0/tests/build/root.build b/tests/repository/1/common/libhello-1.0.0+1/tests/build/root.build
index 0efa852..672eda8 100644
--- a/tests/repository/1/common/libhello-1.0.0/tests/build/root.build
+++ b/tests/repository/1/common/libhello-1.0.0+1/tests/build/root.build
@@ -5,6 +5,6 @@ cxx{*}: extension = cxx
 
 cxx.std = 11
 
-# Every exe{} here is by default a test.
+# Every exe{} in this subproject is by default a test.
 #
 test.exe = true
diff --git a/tests/repository/1/common/libhello-1.0.0/tests/buildfile b/tests/repository/1/common/libhello-1.0.0+1/tests/buildfile
index 7688d2c..4dcbe2a 100644
--- a/tests/repository/1/common/libhello-1.0.0/tests/buildfile
+++ b/tests/repository/1/common/libhello-1.0.0+1/tests/buildfile
@@ -1,3 +1,3 @@
 d = test/
-.: $d
+./: $d
 include $d
diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile b/tests/repository/1/common/libhello-1.0.0+1/tests/test/buildfile
index a46969d..a46969d 100644
--- a/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile
+++ b/tests/repository/1/common/libhello-1.0.0+1/tests/test/buildfile
diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx b/tests/repository/1/common/libhello-1.0.0+1/tests/test/driver.cxx
index 59bfb2d..59bfb2d 100644
--- a/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx
+++ b/tests/repository/1/common/libhello-1.0.0+1/tests/test/driver.cxx
diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/test.out b/tests/repository/1/common/libhello-1.0.0+1/tests/test/test.out
index 8ab686e..8ab686e 100644
--- a/tests/repository/1/common/libhello-1.0.0/tests/test/test.out
+++ b/tests/repository/1/common/libhello-1.0.0+1/tests/test/test.out
diff --git a/tests/repository/1/common/libhello-1.0.0/version b/tests/repository/1/common/libhello-1.0.0+1/version
index 3eefcb9..3eefcb9 100644
--- a/tests/repository/1/common/libhello-1.0.0/version
+++ b/tests/repository/1/common/libhello-1.0.0+1/version
diff --git a/tests/repository/1/common/libhello-1.0.0/buildfile b/tests/repository/1/common/libhello-1.0.0/buildfile
deleted file mode 100644
index 563ebdc..0000000
--- a/tests/repository/1/common/libhello-1.0.0/buildfile
+++ /dev/null
@@ -1,3 +0,0 @@
-d = hello/ tests/
-.: $d file{version manifest}
-include $d
diff --git a/tests/repository/1/common/libhello-1.0.0/hello/hello b/tests/repository/1/common/libhello-1.0.0/hello/hello
deleted file mode 100644
index 64c84b8..0000000
--- a/tests/repository/1/common/libhello-1.0.0/hello/hello
+++ /dev/null
@@ -1,12 +0,0 @@
-// file: hello/hello -*- C++ -*-
-
-#ifndef HELLO_HELLO
-#define HELLO_HELLO
-
-namespace hello
-{
-  void
-  say (const char* name);
-}
-
-#endif // HELLO_HELLO
diff --git a/tests/repository/1/common/libhello-1.0.0/manifest b/tests/repository/1/common/libhello-1.0.0/manifest
deleted file mode 100644
index 065eb38..0000000
--- a/tests/repository/1/common/libhello-1.0.0/manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-: 1
-name: libhello
-version: 1.0.0
-summary: The Hello World example library
-license: MIT
-tags: c++, hello, world, example
-description: A simple library that implements the Hello World example in\
- C++. Its primary goal is to show a canonical build2/bpkg project/package.
-url: http://www.example.org/libhello
-email: hello-users@example.org
diff --git a/tests/test.sh b/tests/test.sh
index e68b7eb..ea0da34 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -172,7 +172,7 @@ fail pkg-verify                 # archive expected
 fail pkg-verify ./no-such-file  # archive does not exist
 fail pkg-verify repository/1/common/not-a-package.tar.gz
 fail pkg-verify --silent repository/1/common/not-a-package.tar.gz
-test pkg-verify repository/1/common/hello/libhello-1.0.0.tar.gz
+test pkg-verify repository/1/common/hello/libhello-1.0.0+1.tar.gz
 
 
 ##
@@ -339,7 +339,7 @@ test pkg-purge libfoo
 test cfg-create --wipe
 test cfg-add $rep/common/hello
 test cfg-fetch
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 test pkg-purge libhello
 
 
@@ -396,7 +396,7 @@ test pkg-purge libfoo
 test cfg-create --wipe
 test cfg-add $rep/common/hello
 test cfg-fetch
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 test pkg-unpack libhello
 test pkg-purge libhello
 
@@ -513,7 +513,7 @@ fail pkg-configure libhello1              # no such package
 fail pkg-disfigure                        # package name expected
 fail pkg-disfigure libhello1              # no such package
 
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 
 fail pkg-configure libhello               # wrong package state
 fail pkg-disfigure libhello               # wrong package state
@@ -522,69 +522,69 @@ test pkg-purge libhello
 
 # src == out
 #
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 test pkg-unpack libhello
 test pkg-configure libhello
-stat libhello "configured 1.0.0"
+stat libhello "configured 1.0.0+1"
 test pkg-disfigure libhello
-stat libhello "unpacked 1.0.0"
+stat libhello "unpacked 1.0.0+1"
 test pkg-purge libhello
-stat libhello/1.0.0 available
+stat libhello/1.0.0 "available 1.0.0+1"
 
 # src != out
 #
 test cfg-create --wipe
-test pkg-unpack -e repository/1/common/libhello-1.0.0
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
 test pkg-configure libhello
-stat libhello "configured 1.0.0"
+stat libhello "configured 1.0.0+1"
 test pkg-disfigure libhello
-stat libhello "unpacked 1.0.0"
+stat libhello "unpacked 1.0.0+1"
 test pkg-purge libhello
 stat libhello unknown
-gone $cfg/libhello-1.0.0
+gone $cfg/libhello-1.0.0+1
 
 # out still exists after disfigure
 #
-test pkg-unpack -e repository/1/common/libhello-1.0.0
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
 test pkg-configure libhello
-touch $cfg/libhello-1.0.0/stray
+touch $cfg/libhello-1.0.0+1/stray
 fail pkg-disfigure libhello
-stat libhello/1.0.0 broken
-rm -r $cfg/libhello-1.0.0
+stat libhello/1.0.0+1 broken
+rm -r $cfg/libhello-1.0.0+1
 test pkg-purge -f libhello
 stat libhello unknown
 
 # disfigure failed
 #
-test pkg-unpack -e repository/1/common/libhello-1.0.0
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
 test pkg-configure libhello
-chmod 555 $cfg/libhello-1.0.0
+chmod 555 $cfg/libhello-1.0.0+1
 fail pkg-disfigure libhello
-stat libhello/1.0.0 broken
-chmod 755 $cfg/libhello-1.0.0
-rm -r $cfg/libhello-1.0.0
+stat libhello/1.0.0+1 broken
+chmod 755 $cfg/libhello-1.0.0+1
+rm -r $cfg/libhello-1.0.0+1
 test pkg-purge -f libhello
 stat libhello unknown
 
 # configure failed but disfigure succeeds
 #
-test pkg-unpack -e repository/1/common/libhello-1.0.0
-mkdir -p $cfg/libhello-1.0.0/build
-chmod 555 $cfg/libhello-1.0.0/build
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
+mkdir -p $cfg/libhello-1.0.0+1/build
+chmod 555 $cfg/libhello-1.0.0+1/build
 fail pkg-configure libhello
-stat libhello "unpacked 1.0.0"
+stat libhello "unpacked 1.0.0+1"
 test pkg-purge libhello
 stat libhello unknown
 
 # configure and disfigure both failed
 #
-test pkg-unpack -e repository/1/common/libhello-1.0.0
-mkdir -p $cfg/libhello-1.0.0/build
-chmod 555 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build # Trip both con/dis.
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
+mkdir -p $cfg/libhello-1.0.0+1/build
+chmod 555 $cfg/libhello-1.0.0+1 $cfg/libhello-1.0.0+1/build # Trip both con/dis.
 fail pkg-configure libhello
-stat libhello/1.0.0 broken
-chmod 755 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build
-rm -r $cfg/libhello-1.0.0
+stat libhello/1.0.0+1 broken
+chmod 755 $cfg/libhello-1.0.0+1 $cfg/libhello-1.0.0+1/build
+rm -r $cfg/libhello-1.0.0+1
 test pkg-purge -f libhello
 stat libhello unknown
 
@@ -712,13 +712,13 @@ test cfg-fetch
 
 fail pkg-update                # package name expected
 fail pkg-update libhello       # no such package
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 fail pkg-update libhello       # wrong package state
 test pkg-purge libhello
 
 # src == out
 #
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 test pkg-unpack libhello
 test pkg-configure libhello
 test pkg-update libhello
@@ -729,7 +729,7 @@ test pkg-purge libhello
 # src != out
 #
 test cfg-create --wipe
-test pkg-unpack -e repository/1/common/libhello-1.0.0
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
 test pkg-configure libhello
 test pkg-update libhello
 test pkg-update libhello
@@ -744,15 +744,15 @@ test cfg-create --wipe
 test cfg-add $rep/common/hello
 test cfg-fetch
 
-fail pkg-clean                # package name expected
-fail pkg-clean libhello       # no such package
-test pkg-fetch libhello/1.0.0
-fail pkg-clean libhello       # wrong package state
+fail pkg-clean                  # package name expected
+fail pkg-clean libhello         # no such package
+test pkg-fetch libhello/1.0.0+1
+fail pkg-clean libhello         # wrong package state
 test pkg-purge libhello
 
 # src == out
 #
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 test pkg-unpack libhello
 test pkg-configure libhello
 test pkg-update libhello
@@ -764,7 +764,7 @@ test pkg-purge libhello
 # src != out
 #
 test cfg-create --wipe
-test pkg-unpack -e repository/1/common/libhello-1.0.0
+test pkg-unpack -e repository/1/common/libhello-1.0.0+1
 test pkg-configure libhello
 test pkg-update libhello
 test pkg-clean libhello
@@ -783,7 +783,7 @@ test pkg-purge libhello
 test cfg-create --wipe cxx
 test cfg-add $rep/common/hello
 test cfg-fetch
-test pkg-fetch libhello/1.0.0
+test pkg-fetch libhello/1.0.0+1
 test pkg-unpack libhello
 test pkg-configure libhello
 test pkg-update libhello