- some tiny adaptions

diff --git a/scripts/snapper-daily b/scripts/snapper-daily
index ff266dad1f298dea3d11f49c3ad7c857fd05d25c..64f4a9e227476430846e1506c4da8fcdb61c9424 100755 (executable)
--- a/scripts/snapper-daily
+++ b/scripts/snapper-daily
@@ -19,7 +19,7 @@ fi
 #
 # run snapper for all configs
 #
-for CONFIG in $CONFIGS ; do
+for CONFIG in $SNAPPER_CONFIGS ; do
 
     NUMBER_CLEANUP="no"
     TIMELINE_CLEANUP="no"

diff --git a/scripts/snapper-hourly b/scripts/snapper-hourly
index 0ec5c69e9af12039cfe18a8f04b0ef5640e74f3e..da1bb7374ef21a1636bd60dcb75d51960b8ad279 100755 (executable)
--- a/scripts/snapper-hourly
+++ b/scripts/snapper-hourly
@@ -19,7 +19,7 @@ fi
 #
 # run snapper for all configs
 #
-for CONFIG in $CONFIGS ; do
+for CONFIG in $SNAPPER_CONFIGS ; do
 
     TIMELINE_CREATE="no"
 

diff --git a/testsuite-real/common.cc b/testsuite-real/common.cc
index 3b6798c5a526286036338514d3c691676eaf5ee6..0a7a116dd89f1771f72fd8c415a610616c477bc9 100644 (file)
--- a/testsuite-real/common.cc
+++ b/testsuite-real/common.cc
@@ -19,7 +19,7 @@ extern char* program_invocation_short_name;
 
 using namespace snapper;
 
-#define ROOTDIR "/test"
+#define SUBVOLUME "/test"
 
 Snapper* sh = NULL;
 
@@ -30,12 +30,12 @@ Snapshots::iterator second;
 void
 setup()
 {
-    system("/usr/bin/find " ROOTDIR " -mindepth 1 -maxdepth 1 -not -path " ROOTDIR "/snapshots "
+    system("/usr/bin/find " SUBVOLUME " -mindepth 1 -maxdepth 1 -not -path " SUBVOLUME "/snapshots "
           "-exec rm -r {} \\;");
 
     initDefaultLogger();
 
-    sh = createSnapper(ROOTDIR);
+    sh = createSnapper("testsuite");
 }
 
 
@@ -103,6 +103,6 @@ check_first()
 void
 run_command(const char* command)
 {
-    string tmp = string("cd " ROOTDIR " ; ") + command;
+    string tmp = string("cd " SUBVOLUME " ; ") + command;
     check_zero(system(tmp.c_str()));
 }