From 4fb1c1b0e8ca8510c76d849e3b330c52934bca16 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 17 Jun 2013 21:57:45 +0000 Subject: Remove test mode and provide hooks to use a test suite. Tests will now be handled by a test suite in a future commit, so this mode will not be needed anymore. The test suite will work by replacing the mounting script by a fake mounting script that points to a directory with a systems folder. Also add trap again, now that it is more tested. --- .../upgrades.in/systems/version2/orig/etc/file3 | 2 ++ .../upgrades.in/systems/version2/orig/etc/file4 | 2 ++ .../upgrades.in/systems/version2/orig/etc/file6 | 2 ++ .../upgrades.in/systems/version2/orig/etc/file7 | 2 ++ .../upgrades.in/systems/version2/orig/etc/file7.1 | 8 ++++++++ .../upgrades.in/systems/version2/orig/etc/subdir1/subfile1 | 10 ++++++++++ .../systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 | 0 .../bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 | 2 ++ .../bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 | 2 ++ .../bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 | 2 ++ .../bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 | 2 ++ .../upgrades.in/systems/version2/run/etc/file7.1 | 8 ++++++++ .../upgrades.in/systems/version2/run/etc/subdir1/subfile1 | 10 ++++++++++ .../systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 | 0 14 files changed, 52 insertions(+) create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 (limited to 'tests/bscs-merge.pass/upgrades.in/systems/version2') diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 new file mode 100644 index 0000000..e76efb0 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 new file mode 100644 index 0000000..e76efb0 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 -- cgit v1.2.1