1 files changed, 53 insertions, 18 deletions
diff --git a/intro2-tour.orig b/intro2-tour.orig
index 9d7d50a..e8e2c21 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -129,6 +129,22 @@ test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hel
 
 + ../hello-clang/hello/hello/hello World
 Hello, World!
+rm ../hello-clang/hello/hello/exe{hello}
+rm ../hello-clang/hello/hello/obje{hello}
+rm ../hello-clang/hello/fsdir{hello/}
+
++ bdep test @clang
+mkdir ../hello-clang/hello/fsdir{hello/}
+c++ hello/cxx{hello}@../hello-clang/hello/hello/
+ld ../hello-clang/hello/hello/exe{hello}
+test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
+
++ bdep test @gcc @clang
+in configuration @gcc:
+test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+
+in configuration @clang:
+test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
 
 + bdep init -C ../hello-mingw @mingw cc config.cxx=x86_64-w64-mingw32-g++
 initializing project /tmp/hello/
@@ -136,12 +152,12 @@ created configuration @mingw /tmp/hello-mingw/ (5, auto-synchronized)
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
-+ b ../hello-mingw/hello/
++ bdep update @mingw
 mkdir ../hello-mingw/hello/fsdir{hello/}
 c++ hello/cxx{hello}@../hello-mingw/hello/hello/
 ld ../hello-mingw/hello/hello/exe{hello}
 
-+ b test: ../hello-mingw/hello/
++ bdep test @mingw
 test hello/test{testscript}@../hello-mingw/hello/hello/ ../hello-mingw/hello/hello/exe{hello}
 
 + ../hello-mingw/hello/hello/hello.exe Windows
@@ -194,7 +210,7 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100%  101M=0s
+     0K ...                                                   100% 94.3M=0s
 + b
 synchronizing /tmp/hello-gcc/:
   upgrade hello/0.1.0-a.0.19700101000000#2
@@ -223,7 +239,26 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100%  100M=0s
+     0K ...                                                   100% 98.9M=0s
++ bdep test -ai
+in configuration @gcc:
+c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver}
+ld ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
+test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
+
+in configuration @clang:
+mkdir ../hello-clang/hello/fsdir{hello/}
+ver ../hello-clang/libhello-1.0.0/libhello/version.hxx.in
+c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver}
+c++ ../hello-clang/libhello-1.0.0/libhello/cxx{hello}
+c++ hello/cxx{hello}@../hello-clang/hello/hello/
+ld ../hello-clang/libhello-1.0.0/libhello/libs{hello}
+ld ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
+ld ../hello-clang/hello/hello/exe{hello}
+test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
+test ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
+
 + bdep status
 hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3
 
@@ -235,7 +270,7 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#4
 
-     0K ...                                                   100%  110M=0s
+     0K ...                                                   100% 95.9M=0s
 + bdep fetch
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
@@ -341,16 +376,16 @@ distributing libhello/1.1.0
 
 + b test: ../hello-gcc-1/
 mkdir ../hello-gcc-1/hello/fsdir{hello/}
-ver ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in
 ver ../hello-gcc-1/libhello-1.1.0/libhello/version.hxx.in
+ver ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in
 ver ../hello-gcc-1/libprint-1.0.0/libprint/version.hxx.in
+c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
 c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver}
 c++ ../hello-gcc-1/libprint-1.0.0/libprint/cxx{print}
-c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
-c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
 c++ ../hello-gcc-1/libhello-1.1.0/libhello/cxx{hello}
-c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver}
 c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
+c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver}
+c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
 ld ../hello-gcc-1/libprint-1.0.0/libprint/libs{print}
 ld ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/libformat-1.0.0/libformat/libs{format}
@@ -358,9 +393,9 @@ ld ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/libhello-1.1.0/libhello/libs{hello}
 ld ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/hello/hello/exe{hello}
+test hello/test{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
 test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
 test ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
-test hello/test{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
 test ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
 
 + b configure: ../hello-gcc/ config.cc.poptions+=-I/tmp/unpkg-gcc/include config.cc.loptions+=-L/tmp/unpkg-gcc/lib
@@ -381,7 +416,7 @@ test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/e
 synchronizing:
   configure sys:libsqlite3/*
   upgrade hello/0.1.0-a.0.19700101000000#5
-[master (root-commit) 5b25d75] Start hello project
+[master (root-commit) 7566fd1] Start hello project
  11 files changed, 118 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
@@ -396,11 +431,11 @@ synchronizing:
  create mode 100644 repositories.manifest
 
 + bdep status
-hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180510124033.5b25d75685ae
+hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180512075852.7566fd12c353
 
 + b info
 project: hello
-version: 0.1.0-a.0.20180510124033.5b25d75685ae
+version: 0.1.0-a.0.20180512075852.7566fd12c353
 summary: hello executable project
 url: https://example.org/hello
 src_root: /tmp/hello/
@@ -410,15 +445,15 @@ subprojects:
 
 + bdep sync
 synchronizing:
-  upgrade hello/0.1.0-a.0.20180510124033.5b25d75685ae
+  upgrade hello/0.1.0-a.0.20180512075852.7566fd12c353
 
 + bdep status
-hello configured 0.1.0-a.0.20180510124033.5b25d75685ae
-[master eb8aa04] Another commit
+hello configured 0.1.0-a.0.20180512075852.7566fd12c353
+[master 13e11b0] Another commit
  1 file changed, 1 insertion(+)
 
 + bdep status
-hello configured 0.1.0-a.0.20180510124033.5b25d75685ae available 0.1.0-a.0.20180510124033.eb8aa0400c02
+hello configured 0.1.0-a.0.20180512075852.7566fd12c353 available 0.1.0-a.0.20180512075853.13e11b05aacb
 
 + bpkg create -d tools cc config.cxx=g++ config.cc.coptions=-O3 config.install.root=/opt/tools config.install.sudo=sudo config.bin.rpath=/opt/tools/lib
 created new configuration in /tmp/tools/
@@ -458,9 +493,9 @@ configured hello/1.0.0
 ver libhello-1.1.0/libhello/version.hxx.in
 ver libprint-1.0.0/libprint/version.hxx.in
 ver libformat-1.0.0/libformat/version.hxx.in
+c++ libhello-1.1.0/libhello/cxx{hello}
 c++ libprint-1.0.0/libprint/cxx{print}
 c++ libformat-1.0.0/libformat/cxx{format}
-c++ libhello-1.1.0/libhello/cxx{hello}
 c++ hello-1.0.0/hello/cxx{hello}
 ld libprint-1.0.0/libprint/libs{print}
 ld libformat-1.0.0/libformat/libs{format}