aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/common/git/state0/libbar.tarbin71680 -> 71680 bytes
-rw-r--r--tests/common/git/state0/libfoo.tarbin296960 -> 296960 bytes
-rw-r--r--tests/common/git/state0/style-basic.tarbin71680 -> 71680 bytes
-rw-r--r--tests/common/git/state0/style.tarbin133120 -> 133120 bytes
-rw-r--r--tests/common/git/state1/libbaz.tarbin61440 -> 61440 bytes
-rw-r--r--tests/common/git/state1/libfoo.tarbin378880 -> 378880 bytes
-rw-r--r--tests/common/git/state1/style-basic.tarbin71680 -> 71680 bytes
-rw-r--r--tests/common/git/state1/style.tarbin133120 -> 133120 bytes
-rw-r--r--tests/pkg-status.test51
l---------tests/pkg-status/git/libbar.tar1
l---------tests/pkg-status/git/style-basic.tar1
l---------tests/pkg-status/git/style.tar1
12 files changed, 50 insertions, 4 deletions
diff --git a/tests/common/git/state0/libbar.tar b/tests/common/git/state0/libbar.tar
index e78ae06e..1046f4b 100644
--- a/tests/common/git/state0/libbar.tar
+++ b/tests/common/git/state0/libbar.tar
Binary files differ
diff --git a/tests/common/git/state0/libfoo.tar b/tests/common/git/state0/libfoo.tar
index 141a341..d917a68 100644
--- a/tests/common/git/state0/libfoo.tar
+++ b/tests/common/git/state0/libfoo.tar
Binary files differ
diff --git a/tests/common/git/state0/style-basic.tar b/tests/common/git/state0/style-basic.tar
index 217ee7c..a16e009 100644
--- a/tests/common/git/state0/style-basic.tar
+++ b/tests/common/git/state0/style-basic.tar
Binary files differ
diff --git a/tests/common/git/state0/style.tar b/tests/common/git/state0/style.tar
index fc3faa0..0d40071 100644
--- a/tests/common/git/state0/style.tar
+++ b/tests/common/git/state0/style.tar
Binary files differ
diff --git a/tests/common/git/state1/libbaz.tar b/tests/common/git/state1/libbaz.tar
index 373863e..74661aa 100644
--- a/tests/common/git/state1/libbaz.tar
+++ b/tests/common/git/state1/libbaz.tar
Binary files differ
diff --git a/tests/common/git/state1/libfoo.tar b/tests/common/git/state1/libfoo.tar
index 23275c8..276e6ba 100644
--- a/tests/common/git/state1/libfoo.tar
+++ b/tests/common/git/state1/libfoo.tar
Binary files differ
diff --git a/tests/common/git/state1/style-basic.tar b/tests/common/git/state1/style-basic.tar
index e4e14e9..ad067f4 100644
--- a/tests/common/git/state1/style-basic.tar
+++ b/tests/common/git/state1/style-basic.tar
Binary files differ
diff --git a/tests/common/git/state1/style.tar b/tests/common/git/state1/style.tar
index 52389c3..67bcb87 100644
--- a/tests/common/git/state1/style.tar
+++ b/tests/common/git/state1/style.tar
Binary files differ
diff --git a/tests/pkg-status.test b/tests/pkg-status.test
index 3c00e97..3e27294 100644
--- a/tests/pkg-status.test
+++ b/tests/pkg-status.test
@@ -2,7 +2,7 @@
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
-.include common.test config.test remote.test
+.include common.test config.test remote.test remote-git.test
# Source repository:
#
@@ -10,17 +10,25 @@
# |-- extra -> stable (prerequisite)
# | |-- libbar-1.1.0+1.tar.gz
# | `-- repositories
+# |
# |-- stable
# | |-- libbar-1.0.0.tar.gz
# | |-- libfoo-1.0.0.tar.gz
# | `-- repositories
+# |
# |-- testing -> stable (complement), extra (prerequisite)
# | |-- libbar-1.0.0+1.tar.gz
# | |-- libbar-1.1.0.tar.gz
# | `-- repositories
-# `-- unstable -> testing (complement)
-# |-- libbar-2.0.0.tar.gz
-# `-- repositories
+# |
+# |-- unstable -> testing (complement)
+# | |-- libbar-2.0.0.tar.gz
+# | `-- repositories
+# |
+# `-- git
+# |-- libbar.git -> style-basic.git (prerequisite)
+# |-- style-basic.git
+# `-- style.git
# Prepare repositories used by tests if running in the local mode.
#
@@ -31,6 +39,12 @@
cp -r $src/stable $out/stable && $c $out/stable &$out/stable/packages
cp -r $src/testing $out/testing && $c $out/testing &$out/testing/packages
cp -r $src/unstable $out/unstable && $c $out/unstable &$out/unstable/packages
+
+ # Create git repositories.
+ #
+ $git_extract $src/git/style.tar
+ $git_extract $src/git/libbar.tar
+ $git_extract $src/git/style-basic.tar &$out_git/state0/***
end
pkg_fetch += 2>!
@@ -158,3 +172,32 @@ rep_fetch += -d cfg --auth all --trust-yes 2>!
$* -d ../fetched2 libbar >'fetched 2.0.0; available sys:?'
}
}
+
+: git-repos
+:
+if ($git_supported != true)
+{
+ # Skip git repository tests.
+ #
+}
+else
+{
+ rep = "$rep_git/state0"
+ rep_add += -d cfg 2>!
+ test.cleanups += &cfg/.bpkg/repositories/*/***
+
+ : complement-cycle
+ :
+ : Make sure that we properly handle the root<->style repository dependency
+ : cycle while searching for the style-basic package, that is an available
+ : package but not from the user-added repository (or its complement), and so
+ : is not visible for the status command. Note that the root repository is the
+ : default complement for git repositories (see rep_fetch() implementation for
+ : the reasoning).
+ :
+ $clone_root_cfg;
+ $rep_add "$rep/libbar.git#master" && $rep_add "$rep/style.git#master";
+ $rep_fetch;
+
+ $* style-basic >'unknown'
+}
diff --git a/tests/pkg-status/git/libbar.tar b/tests/pkg-status/git/libbar.tar
new file mode 120000
index 0000000..67ccdb1
--- /dev/null
+++ b/tests/pkg-status/git/libbar.tar
@@ -0,0 +1 @@
+../../common/git/state0/libbar.tar \ No newline at end of file
diff --git a/tests/pkg-status/git/style-basic.tar b/tests/pkg-status/git/style-basic.tar
new file mode 120000
index 0000000..2833f83
--- /dev/null
+++ b/tests/pkg-status/git/style-basic.tar
@@ -0,0 +1 @@
+../../common/git/state0/style-basic.tar \ No newline at end of file
diff --git a/tests/pkg-status/git/style.tar b/tests/pkg-status/git/style.tar
new file mode 120000
index 0000000..948d152
--- /dev/null
+++ b/tests/pkg-status/git/style.tar
@@ -0,0 +1 @@
+../../common/git/state0/style.tar \ No newline at end of file