aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/common/git/init8
-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/libfox.tarbin133120 -> 133120 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/libfox.tarbin133120 -> 133120 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/rep-fetch.test4
-rw-r--r--tests/rep-info.test11
-rw-r--r--tests/rep-list.test2
14 files changed, 21 insertions, 4 deletions
diff --git a/tests/common/git/init b/tests/common/git/init
index e80ebf4..1c15bd6 100755
--- a/tests/common/git/init
+++ b/tests/common/git/init
@@ -60,6 +60,7 @@ rm -f -r style.git/basic
rm -f -r style-basic.git/.git
rm -f style-basic.git/README
rm -f style-basic.git/INSTALL
+rm -f style-basic.git/repositories.manifest
# Create master branch for style-basic.git.
#
@@ -69,10 +70,15 @@ git -C style-basic.git commit -am 'Create'
# Create stable branch for style-basic.
#
+sleep 1 # Make sure that master commits are older than stable commits.
git -C style-basic.git branch stable
git -C style-basic.git checkout stable
touch style-basic.git/README
-git -C style-basic.git add README
+cat <<EOF >style-basic.git/repositories.manifest
+: 1
+email: user@example.com
+EOF
+git -C style-basic.git add README repositories.manifest
git -C style-basic.git commit -am 'README'
# Create master branch for style.git, adding style-basic.git as a submodule.
diff --git a/tests/common/git/state0/libbar.tar b/tests/common/git/state0/libbar.tar
index 8be7c94..58b58bd 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 31b5519..7aa0a9d 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/libfox.tar b/tests/common/git/state0/libfox.tar
index b4037c5..81d6c85 100644
--- a/tests/common/git/state0/libfox.tar
+++ b/tests/common/git/state0/libfox.tar
Binary files differ
diff --git a/tests/common/git/state0/style-basic.tar b/tests/common/git/state0/style-basic.tar
index 80731dd..481705c 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 1a88771..127f82f 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 298712c..572c56b 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 2f2e3b4..4512930 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/libfox.tar b/tests/common/git/state1/libfox.tar
index d296973..4046ded 100644
--- a/tests/common/git/state1/libfox.tar
+++ b/tests/common/git/state1/libfox.tar
Binary files differ
diff --git a/tests/common/git/state1/style-basic.tar b/tests/common/git/state1/style-basic.tar
index 7391b66..604e8c8 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 4be977b..dab3fd7 100644
--- a/tests/common/git/state1/style.tar
+++ b/tests/common/git/state1/style.tar
Binary files differ
diff --git a/tests/rep-fetch.test b/tests/rep-fetch.test
index 5028bf9..47be179 100644
--- a/tests/rep-fetch.test
+++ b/tests/rep-fetch.test
@@ -39,7 +39,7 @@
# | | `-- root.build
# | `-- *
# |
-# |-- circle
+# |-- cycle
# | |-- extra -> stable (prerequisite)
# | | |-- libbar-1.1.0+1.tar.gz
# | | `-- repositories.manifest
@@ -50,7 +50,7 @@
# | |-- libfoo-1.0.0.tar.gz
# | `-- repositories.manifest
# |
-# |-- no-circle
+# |-- no-cycle
# | |-- extra
# | | |-- libbar-1.1.0+1.tar.gz
# | | `-- repositories.manifest
diff --git a/tests/rep-info.test b/tests/rep-info.test
index cdc9e70..e0c7688 100644
--- a/tests/rep-info.test
+++ b/tests/rep-info.test
@@ -172,4 +172,15 @@ else
libbar/1.0.0
libmbar/1.0.0
EOO
+
+ : repository-manifests
+ :
+ : Here we test that the base repository manifest that comes from the stable
+ : branch is printed because the stable head commit is newer that of the
+ : master branch.
+ :
+ $* -r -m "$rep/style-basic.git#stable,master" >>~%EOO%
+ : 1
+ email: user@example.com
+ EOO
}
diff --git a/tests/rep-list.test b/tests/rep-list.test
index 970379a..c1f0841 100644
--- a/tests/rep-list.test
+++ b/tests/rep-list.test
@@ -142,6 +142,6 @@ else
$* --complements --prerequisites >>~%EOO%
%git:.+libbar#master .+libbar\.git#master%
- % prerequisite git:.+style-basic#stable .+style-basic\.git#stable%
+ % prerequisite git:.+style-basic#stable .+style-basic\.git#stable \(heads/master\)%
EOO
}