From e771c6b80168de37b74cc57dec502dfa418a19a6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 15 May 2018 22:32:38 +0300
Subject: Add some more tests

---
 tests/fetch.test | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'tests/fetch.test')

diff --git a/tests/fetch.test b/tests/fetch.test
index 7fec857..e7fd54e 100644
--- a/tests/fetch.test
+++ b/tests/fetch.test
@@ -4,19 +4,21 @@
 
 .include common.test project.test
 
+cxx = cc "config.cxx=$config.cxx"
+
 new    += 2>!
-init   += cc "config.cxx=$config.cxx" -d prj 2>!
-status += --all
+init   += $cxx -d prj 2>!
+status += --all -d prj
 deinit += -d prj
 
-: add-dependency
+: dependency
 :
 {
   $clone_prj;
-  $init -C prj-cfg @cfg &prj-cfg/***;
+  $init -C @cfg &prj-cfg/***;
 
-  $new -t lib --vcs none libfoo &libfoo/*** 2>!;
-  $new -t lib --vcs none libbar &libbar/*** 2>!;
+  $new -t lib libbar &libbar/*** 2>!;
+  $new -t lib libfoo &libfoo/*** 2>!;
 
   cat <<EOI >+prj/repositories.manifest;
     :
@@ -29,17 +31,19 @@ deinit += -d prj
     type: dir
     EOI
 
+  cat <<EOI >+prj/manifest;
+    depends: libfoo
+    depends: libbar
+    EOI
+
   $* 2>>/"EOE";
     fetching dir:$~/libbar \(complements dir:$~/prj\)
     fetching dir:$~/libfoo \(prerequisite of dir:$~/prj\)
     EOE
 
-  $status -d prj >'prj configured 0.1.0-a.0.19700101000000';
-
-  $bpkg list --complements --prerequisites -d prj-cfg >>/"EOO";
-    dir:$~/prj $~/prj
-      complement dir:$~/libbar $~/libbar
-      prerequisite dir:$~/libfoo $~/libfoo
+  $status libfoo libbar >>~%EOO%;
+    %libfoo available \[.+\]%
+    %libbar available .+%
     EOO
 
   $deinit 2>>/"EOE"
-- 
cgit v1.1