summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-09-22 17:18:42 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-09-22 17:18:42 -0400
commita37441413fbcb00a53d2d13a09d73f2b7c219d9c (patch)
treefefeab198f6a7eaa779ab1fb313efce43c68242d /Makefile
parent1476be59ed091c467680c3b334194ed43f9e0c64 (diff)
downloadcobbler-a37441413fbcb00a53d2d13a09d73f2b7c219d9c.tar.gz
cobbler-a37441413fbcb00a53d2d13a09d73f2b7c219d9c.tar.xz
cobbler-a37441413fbcb00a53d2d13a09d73f2b7c219d9c.zip
Ensure that the default value for ownership is a list. Also some cleanup to the way we save settings in the middle of test runs. Also also some manpage cleanup pointed out by bretm.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 12 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 85b6f8b7..0fc8c581 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,18 @@ manpage:
pod2html ./docs/cobbler.pod > ./docs/cobbler.html
test: devinstall
- -mkdir -p /tmp/cobbler_test_bak
- -cp /var/lib/cobbler/distros* /tmp/cobbler_test_bak
- -cp /var/lib/cobbler/profiles* /tmp/cobbler_test_bak
- -cp /var/lib/cobbler/systems* /tmp/cobbler_test_bak
- -cp /var/lib/cobbler/repos* /tmp/cobbler_test_bak
- -cp /var/lib/cobbler/repos* /tmp/cobbler_test_bak
+ -rm -rf /tmp/cobbler_test_bak
+ mkdir -p /tmp/cobbler_test_bak
+ cp /etc/cobbler/settings /tmp/cobbler_test_bak/settings
+ cp /etc/cobbler/modules.conf /tmp/cobbler_test_bak/modules.conf
+ cp -a /var/lib/cobbler/config /tmp/cobbler_test_bak/config
python tests/tests.py
- -cp /tmp/cobbler_test_bak/* /var/lib/cobbler
+ -rm -rf /var/lib/cobbler/config
+ -rm /etc/cobbler/settings
+ -rm /etc/cobbler/modules.conf
+ cp -a /tmp/cobbler_test_bak/config /var/lib/cobbler/
+ cp /tmp/cobbler_test_bak/settings /etc/cobbler/settings
+ cp /tmp/cobbler_test_bak/modules.conf /etc/cobbler/modules.conf
test2:
python tests/multi.py
@@ -107,7 +111,7 @@ eraseconfig:
-rm /var/lib/cobbler/config/distros.d/*
-rm /var/lib/cobbler/config/images.d/*
-rm /var/lib/cobbler/config/profiles.d/*
- -rm /var/lib/cobbler/config/systems.d/
+ -rm /var/lib/cobbler/config/systems.d/*
-rm /var/lib/cobbler/config/repos.d/*