[PATCH 0/4 v2] Add a test suite for baserock-system-config-sync

repo: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git branch: baserock/tiagogomes/bscs-test-suite commit: 419af358bfb6d1fa0d937e1508963a92f14df0f0 Tiago Gomes (4): Remove test mode and provide hooks to use a test suite. Add a test suite for baserock-system-config-sync Change the temporary directory used for tests to be based on the current directory Abort the build if some of the tests don't pass Makefile.am | 2 + .../baserock-system-config-sync | 32 ++--- .../config-sync-tests/tests.upgrades.dir.symb/vu/1 | 1 - .../tests.upgrades.etc/v1/sshd_config | 123 -------------------- .../tests.upgrades.etc/v2/sshd_config | 123 -------------------- .../tests.upgrades.etc/vu/sshd_config | 123 -------------------- .../tests.upgrades.regular.symb/vu/1 | 1 - .../tests.upgrades.symblinks/v1/sl1 | 1 - .../tests.upgrades.symblinks/v1/sl2 | 1 - .../tests.upgrades.symblinks/v1/sl3 | 1 - .../tests.upgrades.symblinks/v2/sl1 | 1 - .../tests.upgrades.symblinks/v2/sl3 | 1 - .../tests.upgrades.symblinks/v2/sl4 | 1 - .../tests.upgrades.symblinks/vu/sl1 | 1 - .../tests.upgrades.symblinks/vu/sl2 | 1 - .../tests.upgrades.symblinks/vu/sl4 | 1 - .../config-sync-tests/tests.upgrades/v1/file1 | 2 - .../config-sync-tests/tests.upgrades/v1/file4 | 2 - .../config-sync-tests/tests.upgrades/v1/file5 | 2 - .../config-sync-tests/tests.upgrades/v1/file7 | 2 - .../config-sync-tests/tests.upgrades/v1/file7.1 | 8 -- .../tests.upgrades/v1/subdir1/subfile1 | 10 -- .../config-sync-tests/tests.upgrades/v2/file3 | 2 - .../config-sync-tests/tests.upgrades/v2/file4 | 2 - .../config-sync-tests/tests.upgrades/v2/file6 | 2 - .../config-sync-tests/tests.upgrades/v2/file7 | 2 - .../config-sync-tests/tests.upgrades/v2/file7.1 | 8 -- .../tests.upgrades/v2/subdir1/subfile1 | 10 -- .../config-sync-tests/tests.upgrades/vu/file2 | 2 - .../config-sync-tests/tests.upgrades/vu/file5 | 2 - .../config-sync-tests/tests.upgrades/vu/file6 | 2 - .../config-sync-tests/tests.upgrades/vu/file7 | 2 - tests/bscs-merge.fail/dir.symb.in/systems/default | 1 + .../dir.symb.in/systems/factory/run/etc/1 | 1 + tests/bscs-merge.fail/dir.symb.out/systems/default | 1 + .../dir.symb.out/systems/factory/run/etc/1 | 1 + .../bscs-merge.fail/regular.dir.in/systems/default | 1 + .../regular.dir.out/systems/default | 1 + .../regular.symb.in/systems/default | 1 + .../regular.symb.in/systems/factory/run/etc/1 | 1 + .../regular.symb.out/systems/default | 1 + .../regular.symb.out/systems/factory/run/etc/1 | 1 + tests/bscs-merge.pass/empty.in/systems/default | 1 + .../empty.in/systems/factory/orig/etc/v1v2-1 | 1 + .../empty.in/systems/factory/orig/etc/v1v2-2 | 1 + .../empty.in/systems/factory/orig/etc/v1vu-1 | 1 + .../empty.in/systems/factory/orig/etc/v1vuv2-1 | 1 + .../empty.in/systems/factory/run/etc/v1vu-2 | 1 + .../empty.in/systems/factory/run/etc/v1vuv2-1 | 1 + .../empty.in/systems/factory/run/etc/vuv2-2 | 1 + .../empty.in/systems/version2/orig/etc/v1v2-1 | 1 + .../empty.in/systems/version2/orig/etc/v1vuv2-1 | 1 + .../empty.in/systems/version2/orig/etc/vuv2-1 | 1 + .../empty.in/systems/version2/run/etc/v1v2-1 | 1 + .../empty.in/systems/version2/run/etc/v1vuv2-1 | 1 + .../empty.in/systems/version2/run/etc/vuv2-1 | 1 + tests/bscs-merge.pass/empty.out/systems/default | 1 + .../empty.out/systems/factory/orig/etc/v1v2-1 | 1 + .../empty.out/systems/factory/orig/etc/v1v2-2 | 1 + .../empty.out/systems/factory/orig/etc/v1vu-1 | 1 + .../empty.out/systems/factory/orig/etc/v1vuv2-1 | 1 + .../empty.out/systems/factory/run/etc/v1vu-2 | 1 + .../empty.out/systems/factory/run/etc/v1vuv2-1 | 1 + .../empty.out/systems/factory/run/etc/vuv2-2 | 1 + .../empty.out/systems/version2/orig/etc/v1v2-1 | 1 + .../empty.out/systems/version2/orig/etc/v1vuv2-1 | 1 + .../empty.out/systems/version2/orig/etc/vuv2-1 | 1 + .../empty.out/systems/version2/run/etc/v1v2-1 | 1 + .../empty.out/systems/version2/run/etc/v1vu-2 | 1 + .../empty.out/systems/version2/run/etc/v1vuv2-1 | 1 + .../empty.out/systems/version2/run/etc/vuv2-2 | 1 + tests/bscs-merge.pass/sshconf.in/systems/default | 1 + .../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++ .../sshconf.in/systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++ .../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++ .../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++ tests/bscs-merge.pass/sshconf.out/systems/default | 1 + .../systems/factory/orig/etc/sshd_config | 123 ++++++++++++++++++++ .../systems/factory/run/etc/sshd_config | 123 ++++++++++++++++++++ .../systems/version2/orig/etc/sshd_config | 123 ++++++++++++++++++++ .../systems/version2/run/etc/sshd_config | 123 ++++++++++++++++++++ tests/bscs-merge.pass/symblinks.in/systems/default | 1 + .../symblinks.in/systems/factory/orig/etc/v1 | 1 + .../symblinks.in/systems/factory/orig/etc/v1v2 | 1 + .../symblinks.in/systems/factory/orig/etc/v1vu | 1 + .../symblinks.in/systems/factory/orig/etc/v1vuv2 | 1 + .../symblinks.in/systems/factory/run/etc/v1vu | 1 + .../symblinks.in/systems/factory/run/etc/v1vuv2 | 1 + .../symblinks.in/systems/factory/run/etc/vu | 1 + .../symblinks.in/systems/factory/run/etc/vuv2 | 1 + .../symblinks.in/systems/version2/orig/etc/v1v2 | 1 + .../symblinks.in/systems/version2/orig/etc/v1vuv2 | 1 + .../symblinks.in/systems/version2/orig/etc/v2 | 1 + .../symblinks.in/systems/version2/orig/etc/vuv2 | 1 + .../symblinks.in/systems/version2/run/etc/v1v2 | 1 + .../symblinks.in/systems/version2/run/etc/v1vuv2 | 1 + .../symblinks.in/systems/version2/run/etc/v2 | 1 + .../symblinks.in/systems/version2/run/etc/vuv2 | 1 + tests/bscs-merge.pass/symblinks.in/v1 | 1 + tests/bscs-merge.pass/symblinks.in/v2 | 1 + tests/bscs-merge.pass/symblinks.in/vu | 1 + .../bscs-merge.pass/symblinks.out/systems/default | 1 + .../symblinks.out/systems/factory/orig/etc/v1 | 1 + .../symblinks.out/systems/factory/orig/etc/v1v2 | 1 + .../symblinks.out/systems/factory/orig/etc/v1vu | 1 + .../symblinks.out/systems/factory/orig/etc/v1vuv2 | 1 + .../symblinks.out/systems/factory/run/etc/v1vu | 1 + .../symblinks.out/systems/factory/run/etc/v1vuv2 | 1 + .../symblinks.out/systems/factory/run/etc/vu | 1 + .../symblinks.out/systems/factory/run/etc/vuv2 | 1 + .../symblinks.out/systems/version2/orig/etc/v1v2 | 1 + .../symblinks.out/systems/version2/orig/etc/v1vuv2 | 1 + .../symblinks.out/systems/version2/orig/etc/v2 | 1 + .../symblinks.out/systems/version2/orig/etc/vuv2 | 1 + .../symblinks.out/systems/version2/run/etc/v1 | 1 + .../symblinks.out/systems/version2/run/etc/v1v2 | 1 + .../symblinks.out/systems/version2/run/etc/v1vu | 1 + .../symblinks.out/systems/version2/run/etc/v1vuv2 | 1 + .../symblinks.out/systems/version2/run/etc/v2 | 1 + .../symblinks.out/systems/version2/run/etc/vu | 1 + .../symblinks.out/systems/version2/run/etc/vuv2 | 1 + tests/bscs-merge.pass/symblinks.out/v1 | 1 + tests/bscs-merge.pass/symblinks.out/v2 | 1 + tests/bscs-merge.pass/symblinks.out/vu | 1 + tests/bscs-merge.pass/upgrades.in/systems/default | 1 + .../upgrades.in/systems/factory/orig/etc/file1 | 2 + .../upgrades.in/systems/factory/orig/etc/file4 | 2 + .../upgrades.in/systems/factory/orig/etc/file5 | 2 + .../upgrades.in/systems/factory/orig/etc/file7 | 2 + .../upgrades.in/systems/factory/orig/etc/file7.1 | 8 ++ .../systems/factory/orig/etc/subdir1/subfile1 | 10 ++ .../upgrades.in/systems/factory/run/etc/file2 | 2 + .../upgrades.in/systems/factory/run/etc/file5 | 2 + .../upgrades.in/systems/factory/run/etc/file6 | 2 + .../upgrades.in/systems/factory/run/etc/file7 | 2 + .../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 ++ .../systems/version2/orig/etc/subdir1/subfile1 | 10 ++ .../upgrades.in/systems/version2/run/etc/file3 | 2 + .../upgrades.in/systems/version2/run/etc/file4 | 2 + .../upgrades.in/systems/version2/run/etc/file6 | 2 + .../upgrades.in/systems/version2/run/etc/file7 | 2 + .../upgrades.in/systems/version2/run/etc/file7.1 | 8 ++ .../systems/version2/run/etc/subdir1/subfile1 | 10 ++ tests/bscs-merge.pass/upgrades.out/systems/default | 1 + .../upgrades.out/systems/factory/orig/etc/file1 | 2 + .../upgrades.out/systems/factory/orig/etc/file4 | 2 + .../upgrades.out/systems/factory/orig/etc/file5 | 2 + .../upgrades.out/systems/factory/orig/etc/file7 | 2 + .../upgrades.out/systems/factory/orig/etc/file7.1 | 8 ++ .../systems/factory/orig/etc/subdir1/subfile1 | 10 ++ .../upgrades.out/systems/factory/run/etc/file2 | 2 + .../upgrades.out/systems/factory/run/etc/file5 | 2 + .../upgrades.out/systems/factory/run/etc/file6 | 2 + .../upgrades.out/systems/factory/run/etc/file7 | 2 + .../upgrades.out/systems/version2/orig/etc/file3 | 2 + .../upgrades.out/systems/version2/orig/etc/file4 | 2 + .../upgrades.out/systems/version2/orig/etc/file6 | 2 + .../upgrades.out/systems/version2/orig/etc/file7 | 2 + .../upgrades.out/systems/version2/orig/etc/file7.1 | 8 ++ .../systems/version2/orig/etc/subdir1/subfile1 | 10 ++ .../upgrades.out/systems/version2/run/etc/file1 | 2 + .../upgrades.out/systems/version2/run/etc/file2 | 2 + .../upgrades.out/systems/version2/run/etc/file3 | 2 + .../upgrades.out/systems/version2/run/etc/file4 | 2 + .../upgrades.out/systems/version2/run/etc/file5 | 2 + .../upgrades.out/systems/version2/run/etc/file6 | 2 + .../upgrades.out/systems/version2/run/etc/file7 | 2 + .../upgrades.out/systems/version2/run/etc/file7.1 | 8 ++ .../systems/version2/run/etc/file7.rej | 6 + .../systems/version2/run/etc/subdir1/subfile1 | 10 ++ tests/bscs-sync.in/systems/default | 1 + tests/bscs-sync.in/systems/factory/orig/etc/config | 1 + .../bscs-sync.in/systems/factory/orig/etc/config1 | 2 + .../systems/factory/orig/etc/folder1/config2 | 2 + tests/bscs-sync.in/systems/factory/run/etc/config | 1 + tests/bscs-sync.in/systems/factory/run/etc/config1 | 3 + .../systems/factory/run/etc/folder1/config2 | 2 + .../bscs-sync.in/systems/version2/orig/etc/config | 1 + .../bscs-sync.in/systems/version2/orig/etc/config1 | 2 + .../systems/version2/orig/etc/folder1/config2 | 2 + tests/bscs-sync.in/systems/version2/run/etc/config | 1 + .../bscs-sync.in/systems/version2/run/etc/config1 | 3 + .../systems/version2/run/etc/folder1/config2 | 2 + .../bscs-sync.in/systems/version3/orig/etc/config | 1 + .../bscs-sync.in/systems/version3/orig/etc/config1 | 2 + .../systems/version3/orig/etc/folder1/config2 | 2 + tests/bscs-sync.in/systems/version3/run/etc/config | 1 + .../bscs-sync.in/systems/version3/run/etc/config1 | 3 + .../systems/version3/run/etc/folder1/config2 | 2 + tests/bscs-sync.out/systems/default | 1 + .../bscs-sync.out/systems/factory/orig/etc/config | 1 + .../bscs-sync.out/systems/factory/orig/etc/config1 | 2 + .../systems/factory/orig/etc/folder1/config2 | 2 + tests/bscs-sync.out/systems/factory/run/etc/config | 1 + .../bscs-sync.out/systems/factory/run/etc/config1 | 3 + .../systems/factory/run/etc/folder1/config2 | 2 + .../bscs-sync.out/systems/version2/orig/etc/config | 1 + .../systems/version2/orig/etc/config1 | 2 + .../systems/version2/orig/etc/folder1/config2 | 2 + .../bscs-sync.out/systems/version2/run/etc/config | 1 + .../bscs-sync.out/systems/version2/run/etc/config1 | 3 + .../systems/version2/run/etc/folder1/config2 | 2 + .../bscs-sync.out/systems/version3/orig/etc/config | 1 + .../systems/version3/orig/etc/config1 | 2 + .../systems/version3/orig/etc/folder1/config2 | 2 + .../bscs-sync.out/systems/version3/run/etc/config | 1 + .../bscs-sync.out/systems/version3/run/etc/config1 | 3 + .../systems/version3/run/etc/folder1/config2 | 2 + tests/fake_mounting_script.sh | 36 ++++++ tests/run_tests.sh | 70 ++++++++++- tests/test_lib.sh | 4 +- 215 files changed, 1441 insertions(+), 465 deletions(-) delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 delete mode 120000 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 delete mode 100644 baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/default create mode 120000 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/1 create mode 100644 tests/bscs-merge.fail/dir.symb.in/systems/factory/run/etc/afile create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/default create mode 120000 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/1 create mode 100644 tests/bscs-merge.fail/dir.symb.out/systems/factory/run/etc/afile create mode 120000 tests/bscs-merge.fail/regular.dir.in/systems/default create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/factory/orig/etc/1 create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/orig/etc/1 create mode 100644 tests/bscs-merge.fail/regular.dir.in/systems/version2/run/etc/1 create mode 120000 tests/bscs-merge.fail/regular.dir.out/systems/default create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/factory/orig/etc/1 create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/orig/etc/1 create mode 100644 tests/bscs-merge.fail/regular.dir.out/systems/version2/run/etc/1 create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/default create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1 create mode 120000 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1 create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1 create mode 100644 tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1 create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/default create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/orig/etc/1 create mode 120000 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/1 create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/factory/run/etc/afile create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/orig/etc/1 create mode 100644 tests/bscs-merge.fail/regular.symb.out/systems/version2/run/etc/1 create mode 120000 tests/bscs-merge.pass/empty.in/systems/default create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2 create mode 120000 tests/bscs-merge.pass/empty.out/systems/default create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1 create mode 100644 tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2 create mode 120000 tests/bscs-merge.pass/sshconf.in/systems/default create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config create mode 100644 tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config create mode 120000 tests/bscs-merge.pass/sshconf.out/systems/default create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config create mode 100644 tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/default create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2 create mode 120000 tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2 create mode 100644 tests/bscs-merge.pass/symblinks.in/v1 create mode 100644 tests/bscs-merge.pass/symblinks.in/v2 create mode 100644 tests/bscs-merge.pass/symblinks.in/vu create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/default create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2 create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu create mode 120000 tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2 create mode 100644 tests/bscs-merge.pass/symblinks.out/v1 create mode 100644 tests/bscs-merge.pass/symblinks.out/v2 create mode 100644 tests/bscs-merge.pass/symblinks.out/vu create mode 120000 tests/bscs-merge.pass/upgrades.in/systems/default create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6 create mode 100644 tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7 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 create mode 120000 tests/bscs-merge.pass/upgrades.out/systems/default create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 create mode 100644 tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 create mode 120000 tests/bscs-sync.in/systems/default create mode 120000 tests/bscs-sync.in/systems/factory/orig/etc/config create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/config1 create mode 100644 tests/bscs-sync.in/systems/factory/orig/etc/folder1/config2 create mode 120000 tests/bscs-sync.in/systems/factory/run/etc/config create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/config1 create mode 100644 tests/bscs-sync.in/systems/factory/run/etc/folder1/config2 create mode 120000 tests/bscs-sync.in/systems/version2/orig/etc/config create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/config1 create mode 100644 tests/bscs-sync.in/systems/version2/orig/etc/folder1/config2 create mode 120000 tests/bscs-sync.in/systems/version2/run/etc/config create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/config1 create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/folder1/config2 create mode 100644 tests/bscs-sync.in/systems/version2/run/etc/folder2/iamgoingbeoverwritten create mode 120000 tests/bscs-sync.in/systems/version3/orig/etc/config create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/config1 create mode 100644 tests/bscs-sync.in/systems/version3/orig/etc/folder1/config2 create mode 120000 tests/bscs-sync.in/systems/version3/run/etc/config create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/config1 create mode 100644 tests/bscs-sync.in/systems/version3/run/etc/folder1/config2 create mode 120000 tests/bscs-sync.out/systems/default create mode 120000 tests/bscs-sync.out/systems/factory/orig/etc/config create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/config1 create mode 100644 tests/bscs-sync.out/systems/factory/orig/etc/folder1/config2 create mode 120000 tests/bscs-sync.out/systems/factory/run/etc/config create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/config1 create mode 100644 tests/bscs-sync.out/systems/factory/run/etc/folder1/config2 create mode 120000 tests/bscs-sync.out/systems/version2/orig/etc/config create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/config1 create mode 100644 tests/bscs-sync.out/systems/version2/orig/etc/folder1/config2 create mode 120000 tests/bscs-sync.out/systems/version2/run/etc/config create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/config1 create mode 100644 tests/bscs-sync.out/systems/version2/run/etc/folder1/config2 create mode 120000 tests/bscs-sync.out/systems/version3/orig/etc/config create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/config1 create mode 100644 tests/bscs-sync.out/systems/version3/orig/etc/folder1/config2 create mode 120000 tests/bscs-sync.out/systems/version3/run/etc/config create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/config1 create mode 100644 tests/bscs-sync.out/systems/version3/run/etc/folder1/config2 create mode 100755 tests/fake_mounting_script.sh -- 1.7.10.4