summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2007-07-08 14:08:34 +0000
committerRoger Leigh <rleigh@debian.org>2007-07-08 14:08:34 +0000
commit85c6dc069d6e1de7a27b89214fba77f6b573a54e (patch)
treec30fda00f78ace269a73f729a0166d31d84b2997 /test
parent8bce7cac70a646428b0684f9b6ca15db0dd6735e (diff)
downloadschroot-85c6dc069d6e1de7a27b89214fba77f6b573a54e.tar.gz
* test/sbuild-chroot-block-device.cc, test/sbuild-chroot.cc,
test/sbuild-chroot-file.cc, test/sbuild-chroot-lvm-snapshot.cc, test/sbuild-chroot-plain.cc: Add CHROOT_SCRIPT_CONFIG to environment checks.
Diffstat (limited to 'test')
-rw-r--r--test/sbuild-chroot-block-device.cc3
-rw-r--r--test/sbuild-chroot-file.cc3
-rw-r--r--test/sbuild-chroot-lvm-snapshot.cc3
-rw-r--r--test/sbuild-chroot-plain.cc3
-rw-r--r--test/sbuild-chroot.cc3
5 files changed, 15 insertions, 0 deletions
diff --git a/test/sbuild-chroot-block-device.cc b/test/sbuild-chroot-block-device.cc
index 7635ac31..601ed2a6 100644
--- a/test/sbuild-chroot-block-device.cc
+++ b/test/sbuild-chroot-block-device.cc
@@ -17,6 +17,8 @@
*
*********************************************************************/
+#include <config.h>
+
#include <algorithm>
#include <set>
@@ -101,6 +103,7 @@ public:
expected.add("CHROOT_MOUNT_DEVICE", "/dev/testdev");
expected.add("CHROOT_DEVICE", "/dev/testdev");
expected.add("CHROOT_MOUNT_OPTIONS", "-t jfs -o quota,rw");
+ expected.add("CHROOT_SCRIPT_CONFIG", sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
test_chroot_base<chroot_block_device>::test_setup_env(expected);
}
diff --git a/test/sbuild-chroot-file.cc b/test/sbuild-chroot-file.cc
index fdba04bd..8e277eb2 100644
--- a/test/sbuild-chroot-file.cc
+++ b/test/sbuild-chroot-file.cc
@@ -17,6 +17,8 @@
*
*********************************************************************/
+#include <config.h>
+
#include <sbuild/sbuild-chroot-file.h>
#include "test-helpers.h"
@@ -88,6 +90,7 @@ public:
expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
expected.add("CHROOT_PATH", "/mnt/mount-location");
expected.add("CHROOT_MOUNT_DEVICE", "/dev/device-to-mount");
+ expected.add("CHROOT_SCRIPT_CONFIG", sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
test_chroot_base<chroot_file>::test_setup_env(expected);
}
diff --git a/test/sbuild-chroot-lvm-snapshot.cc b/test/sbuild-chroot-lvm-snapshot.cc
index 50c6a22e..060965e5 100644
--- a/test/sbuild-chroot-lvm-snapshot.cc
+++ b/test/sbuild-chroot-lvm-snapshot.cc
@@ -17,6 +17,8 @@
*
*********************************************************************/
+#include <config.h>
+
#include <sbuild/sbuild-chroot-lvm-snapshot.h>
#include <sbuild/sbuild-util.h>
@@ -110,6 +112,7 @@ public:
expected.add("CHROOT_LVM_SNAPSHOT_NAME", sbuild::basename(c->get_snapshot_device()));
expected.add("CHROOT_LVM_SNAPSHOT_DEVICE", "/dev/snaptestdev");
expected.add("CHROOT_LVM_SNAPSHOT_OPTIONS", "--size 1G");
+ expected.add("CHROOT_SCRIPT_CONFIG", sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
test_chroot_base<chroot_lvm_snapshot>::test_setup_env(expected);
}
diff --git a/test/sbuild-chroot-plain.cc b/test/sbuild-chroot-plain.cc
index 33421b7b..1337633e 100644
--- a/test/sbuild-chroot-plain.cc
+++ b/test/sbuild-chroot-plain.cc
@@ -17,6 +17,8 @@
*
*********************************************************************/
+#include <config.h>
+
#include <sbuild/sbuild-chroot-plain.h>
#include "test-helpers.h"
@@ -89,6 +91,7 @@ public:
expected.add("CHROOT_LOCATION", "/srv/chroot/example-chroot");
expected.add("CHROOT_PATH", "/srv/chroot/example-chroot");
expected.add("CHROOT_MOUNT_DEVICE", "/dev/device-to-mount");
+ expected.add("CHROOT_SCRIPT_CONFIG", sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
test_chroot_base<chroot_plain>::test_setup_env(expected);
}
diff --git a/test/sbuild-chroot.cc b/test/sbuild-chroot.cc
index 38505f38..187eb116 100644
--- a/test/sbuild-chroot.cc
+++ b/test/sbuild-chroot.cc
@@ -17,6 +17,8 @@
*
*********************************************************************/
+#include <config.h>
+
#include <sbuild/sbuild-chroot.h>
#include "test-helpers.h"
@@ -215,6 +217,7 @@ public:
expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
expected.add("CHROOT_PATH", "/mnt/mount-location");
expected.add("CHROOT_MOUNT_DEVICE", "/dev/device-to-mount");
+ expected.add("CHROOT_SCRIPT_CONFIG", sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
test_chroot_base<basic_chroot>::test_setup_env(expected);
}