aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-12-25 01:26:01 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-12-28 14:42:11 +0300
commit21d9f67600a53af44d0f7365074de5312a829193 (patch)
treeb6a09420c12049fc91e07bef80f2333a81ce6330 /tests
parent911f505667eb8c8fd8b69d3f4b0969160eb1de55 (diff)
Adapt to repository location interface change
Diffstat (limited to 'tests')
-rw-r--r--tests/load/driver.cxx35
1 files changed, 12 insertions, 23 deletions
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index 868b393..9322773 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -27,6 +27,9 @@ using namespace odb::core;
using namespace butl;
using namespace brep;
+static const path packages ("packages");
+static const path repositories ("repositories");
+
static bool
check_location (shared_ptr<package>& p)
{
@@ -178,9 +181,7 @@ main (int argc, char* argv[])
assert (sr->packages_timestamp == srt);
assert (sr->repositories_timestamp ==
- file_mtime (
- dir_path (
- sr->cache_location.path ()) / path ("repositories")));
+ file_mtime (sr->cache_location.path () / repositories));
assert (sr->internal);
assert (sr->complements.empty ());
@@ -436,13 +437,10 @@ main (int argc, char* argv[])
assert (mr->cache_location.path () == mrp.normalize ());
assert (mr->packages_timestamp ==
- file_mtime (
- dir_path (mr->cache_location.path ()) / path ("packages")));
+ file_mtime (mr->cache_location.path () / packages));
assert (mr->repositories_timestamp ==
- file_mtime (
- dir_path (
- mr->cache_location.path ()) / path ("repositories")));
+ file_mtime (mr->cache_location.path () / repositories));
assert (mr->internal);
@@ -692,13 +690,10 @@ main (int argc, char* argv[])
assert (cr->cache_location.path () == crp.normalize ());
assert (cr->packages_timestamp ==
- file_mtime (
- dir_path (cr->cache_location.path ()) / path ("packages")));
+ file_mtime (cr->cache_location.path () / packages));
assert (cr->repositories_timestamp ==
- file_mtime (
- dir_path (
- cr->cache_location.path ()) / path ("repositories")));
+ file_mtime (cr->cache_location.path () / repositories));
assert (!cr->internal);
assert (cr->prerequisites.empty ());
@@ -755,13 +750,10 @@ main (int argc, char* argv[])
assert (tr->cache_location.path () == trp.normalize ());
assert (tr->packages_timestamp ==
- file_mtime (
- dir_path (tr->cache_location.path ()) / path ("packages")));
+ file_mtime (tr->cache_location.path () / packages));
assert (tr->repositories_timestamp ==
- file_mtime (
- dir_path (
- tr->cache_location.path ()) / path ("repositories")));
+ file_mtime (tr->cache_location.path () / repositories));
assert (!tr->internal);
assert (tr->prerequisites.empty ());
@@ -806,13 +798,10 @@ main (int argc, char* argv[])
assert (gr->cache_location.path () == grp.normalize ());
assert (gr->packages_timestamp ==
- file_mtime (
- dir_path (gr->cache_location.path ()) / path ("packages")));
+ file_mtime (gr->cache_location.path () / packages));
assert (gr->repositories_timestamp ==
- file_mtime (
- dir_path (
- gr->cache_location.path ()) / path ("repositories")));
+ file_mtime (gr->cache_location.path () / repositories));
assert (!gr->internal);
assert (gr->prerequisites.empty ());