diff options
| -rw-r--r-- | tests/config.testscript | 42 | ||||
| -rw-r--r-- | tests/test.testscript | 6 | ||||
| -rw-r--r-- | tests/update.testscript | 10 |
3 files changed, 38 insertions, 20 deletions
diff --git a/tests/config.testscript b/tests/config.testscript index b1cc325..6469698 100644 --- a/tests/config.testscript +++ b/tests/config.testscript @@ -19,7 +19,10 @@ deinit += -d prj : name-dir : { - $clone_root_prj; + # Note: custom cleanup to deal with backlinks. + # + #$clone_root_prj + cp -pr --no-cleanup ../../prj ./ &prj/***; $* create @cfg cfg-dir $config_cxx 2>>/"EOE" &cfg-dir/***; created configuration @cfg $~/cfg-dir/ 1 target default,forwarded,auto-synchronized @@ -61,7 +64,7 @@ deinit += -d prj EOO $update @cfg 2>>~%EOE%; - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $deinit @cfg 2>>/"EOE" @@ -74,7 +77,10 @@ deinit += -d prj : name : { - $clone_root_prj; + # Note: custom cleanup to deal with backlinks. + # + #$clone_root_prj + cp -pr --no-cleanup ../../prj ./ &prj/***; $* create -- @cfg $config_cxx 2>>/"EOE" &prj-cfg/***; created configuration @cfg $~/prj-cfg/ 1 target default,forwarded,auto-synchronized @@ -93,7 +99,7 @@ deinit += -d prj EOO $update @cfg 2>>~%EOE%; - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $deinit @cfg 2>>/"EOE" @@ -106,7 +112,10 @@ deinit += -d prj : dir : { - $clone_root_prj; + # Note: custom cleanup to deal with backlinks. + # + #$clone_root_prj + cp -pr --no-cleanup ../../prj ./ &prj/***; $* create cfg $config_cxx 2>>/"EOE" &cfg/***; created configuration $~/cfg/ 1 target default,forwarded,auto-synchronized @@ -125,7 +134,7 @@ deinit += -d prj EOO $update -c cfg 2>>~%EOE%; - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $deinit -c cfg 2>>/"EOE" @@ -138,7 +147,10 @@ deinit += -d prj : type : { - $clone_root_prj; + # Note: custom cleanup to deal with backlinks. + # + #$clone_root_prj + cp -pr --no-cleanup ../../prj ./ &prj/***; $* create --config-type host -- @cfg $config_cxx 2>>/"EOE" &prj-cfg/***; created configuration @cfg $~/prj-cfg/ 1 host default,forwarded,auto-synchronized @@ -157,7 +169,7 @@ deinit += -d prj EOO $update @cfg 2>>~%EOE%; - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $deinit @cfg 2>>/"EOE" @@ -205,7 +217,10 @@ deinit += -d prj : add : { - $clone_root_prj; + # Note: custom cleanup to deal with backlinks. + # + #$clone_root_prj + cp -pr --no-cleanup ../prj ./ &prj/***; # Pre-create configurations. # @@ -246,7 +261,7 @@ deinit += -d prj $update --all 2>>~%EOE%; in configuration @cfg1: - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} in configuration @cfg2: %(mkdir|c\+\+|ld) .+%{3} @@ -357,7 +372,10 @@ deinit += -d prj : rename : { - $clone_root_prj; + # Note: custom cleanup to deal with backlinks. + # + #$clone_root_prj + cp -pr --no-cleanup ../prj ./ &prj/***; $* create -- @cfg $config_cxx 2>>/"EOE" &prj-cfg/***; created configuration @cfg $~/prj-cfg/ 1 target default,forwarded,auto-synchronized @@ -374,7 +392,7 @@ deinit += -d prj EOE $update @cfg2 2>>~%EOE%; - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $deinit 2>>/"EOE" diff --git a/tests/test.testscript b/tests/test.testscript index 593a9c7..6b4a05c 100644 --- a/tests/test.testscript +++ b/tests/test.testscript @@ -15,7 +15,7 @@ deinit += -d prj $new -C @cfg prj $config_cxx &prj/*** &prj-cfg/***; $* -d prj 2>>~%EOE%; - %(mkdir|c\+\+|ld|test) .+%{4} + %(mkdir|c\+\+|ld|ln|test) .+%{5} EOE $deinit 2>>/"EOE" @@ -83,7 +83,7 @@ deinit += -d prj % new libprj.+ \(required by pkg1\)% % upgrade pkg1.+19700101000000#1% % upgrade pkg2.+19700101000000#1% - %(mkdir|c\+\+|ld|test) .+%{4} + %(mkdir|c\+\+|ld|ln|test) .+%{5} EOE $* @cfg2 -d prj/pkg2 2>>/~%EOE%; # By name (cfg2). @@ -97,7 +97,7 @@ deinit += -d prj $* -a --recursive -d prj/pkg1 2>>~%EOE% # All configs recursive. in configuration @cfg1: - %(mkdir|version|c\+\+|ld|test) .+%{12} + %(mkdir|version|c\+\+|ld|ln|test) .+%{13} in configuration @cfg2: %(mkdir|version|c\+\+|ld|test) .+%{12} diff --git a/tests/update.testscript b/tests/update.testscript index aba6106..78da255 100644 --- a/tests/update.testscript +++ b/tests/update.testscript @@ -18,7 +18,7 @@ deinit += -d prj $new -C @cfg prj $config_cxx &prj/*** &prj-cfg/***; $* -d prj 2>>~%EOE%; - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $clean -d prj 2>>~%EOE%; @@ -46,7 +46,7 @@ deinit += -d prj # Update. # $* -d prj/pkg1 2>>~%EOE%; # Default (cfg1). - %(mkdir|c\+\+|ld) .+%{3} + %(mkdir|c\+\+|ld|ln) .+%{4} EOE $* @cfg2 -d prj/pkg1 2>>~%EOE%; # By name (cfg2). @@ -55,7 +55,7 @@ deinit += -d prj $* --all -d prj 2>>~%EOE%; # All configs (and packages). in configuration @cfg1: - %(mkdir|c\+\+|ld|info:) .+%{4} + %(mkdir|c\+\+|ld|ln|info:) .+%{5} in configuration @cfg2: %(mkdir|c\+\+|ld|info:) .+%{4} @@ -104,10 +104,10 @@ deinit += -d prj # $* -d prj 2>>~%EOE%; in configuration @cfg1: - %(mkdir|c\+\+|ld) .+pkg1.+%{3} + %(mkdir|c\+\+|ld|ln) .+pkg1.+%{4} in configuration @cfg2: - %(mkdir|c\+\+|ld) .+pkg2.+%{3} + %(mkdir|c\+\+|ld|ln) .+pkg2.+%{4} EOE # Clean. |