Reflect separating repository manifests into repositories file

7 files changed, 37 insertions, 32 deletions

diff --git a/tests/loader/driver.cxx b/tests/loader/driver.cxx
index 1dd011f..0c6c995 100644
--- a/tests/loader/driver.cxx
+++ b/tests/loader/driver.cxx
@@ -97,7 +97,9 @@ main (int argc, char* argv[])
       dir_path srp (cp.directory () / dir_path ("internal/1/stable"));
       assert (sr->local_path == srp.normalize ());
 
-      assert (sr->timestamp == srt);
+      assert (sr->packages_timestamp == srt);
+      assert (sr->repositories_timestamp ==
+              file_mtime (dir_path (sr->local_path) / path ("repositories")));
       assert (sr->internal);
       assert (sr->prerequisite_repositories.size () == 2);
 
@@ -335,8 +337,10 @@ main (int argc, char* argv[])
       dir_path mrp (cp.directory () / dir_path ("internal/1/math"));
       assert (mr->local_path == mrp.normalize ());
 
-      assert (mr->timestamp ==
+      assert (mr->packages_timestamp ==
               file_mtime (dir_path (mr->local_path) / path ("packages")));
+      assert (mr->repositories_timestamp ==
+              file_mtime (dir_path (mr->local_path) / path ("repositories")));
       assert (mr->internal);
       assert (mr->prerequisite_repositories.size () == 1);
       assert (mr->prerequisite_repositories[0].load () == cr);
@@ -411,8 +415,9 @@ main (int argc, char* argv[])
       dir_path crp (cp.directory () / dir_path ("external/1/misc"));
       assert (cr->local_path == crp.normalize ());
 
-      assert (cr->timestamp ==
+      assert (cr->packages_timestamp ==
               file_mtime (dir_path (cr->local_path) / path ("packages")));
+      assert (cr->repositories_timestamp == timestamp_nonexistent);
       assert (!cr->internal);
       assert (cr->prerequisite_repositories.empty ());
 
diff --git a/tests/loader/external/1/misc/packages b/tests/loader/external/1/misc/packages
index d60d7fe..de96771 100644
--- a/tests/loader/external/1/misc/packages
+++ b/tests/loader/external/1/misc/packages
@@ -1,15 +1,4 @@
 : 1
-# Foreign repository manifest.
-#
-location: http://pkg.example.org/1/misc
-:
-# Foreign repository manifest.
-#
-location: http://pkg.example.org/1/math
-:
-# Local repository manifest (this repository).
-#
-:
 name: libbar
 version: 2.3.5
 priority: security; Very important to install.
diff --git a/tests/loader/external/1/misc/repositories b/tests/loader/external/1/misc/repositories
new file mode 100644
index 0000000..5128606
--- /dev/null
+++ b/tests/loader/external/1/misc/repositories
@@ -0,0 +1,11 @@
+: 1
+# Foreign repository manifest.
+#
+location: http://pkg.example.org/1/misc
+:
+# Foreign repository manifest.
+#
+location: http://pkg.example.org/1/math
+:
+# Local repository manifest (this repository).
+#
diff --git a/tests/loader/internal/1/math/packages b/tests/loader/internal/1/math/packages
index 2722f6e..e55168f 100644
--- a/tests/loader/internal/1/math/packages
+++ b/tests/loader/internal/1/math/packages
@@ -1,11 +1,4 @@
 : 1
-# Foreign repository manifest.
-#
-location: ../../../external/1/misc
-:
-# Local repository manifest (this repository).
-#
-:
 name: libexp
 version: 1+1.2
 summary: The exponent
diff --git a/tests/loader/internal/1/math/repositories b/tests/loader/internal/1/math/repositories
new file mode 100644
index 0000000..814d1db
--- /dev/null
+++ b/tests/loader/internal/1/math/repositories
@@ -0,0 +1,7 @@
+: 1
+# Foreign repository manifest.
+#
+location: ../../../external/1/misc
+:
+# Local repository manifest (this repository).
+#
diff --git a/tests/loader/internal/1/stable/packages b/tests/loader/internal/1/stable/packages
index a1aa839..59898c1 100644
--- a/tests/loader/internal/1/stable/packages
+++ b/tests/loader/internal/1/stable/packages
@@ -1,15 +1,4 @@
 : 1
-# Foreign repository manifest.
-#
-location: http://pkg.cppget.org/1/math
-:
-# Foreign repository manifest.
-#
-location: ../../../external/1/misc
-:
-# Local repository manifest (this repository).
-#
-:
 name: libfoo
 version: 1.2.3-4
 summary: The Foo library
diff --git a/tests/loader/internal/1/stable/repositories b/tests/loader/internal/1/stable/repositories
new file mode 100644
index 0000000..4c12e72
--- /dev/null
+++ b/tests/loader/internal/1/stable/repositories
@@ -0,0 +1,11 @@
+: 1
+# Foreign repository manifest.
+#
+location: http://pkg.cppget.org/1/math
+:
+# Foreign repository manifest.
+#
+location: ../../../external/1/misc
+:
+# Local repository manifest (this repository).
+#