diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fetch.testscript | 6 | ||||
| -rw-r--r-- | tests/status.testscript | 4 | ||||
| -rw-r--r-- | tests/sync.testscript | 16 | ||||
| -rw-r--r-- | tests/test.testscript | 16 |
4 files changed, 21 insertions, 21 deletions
diff --git a/tests/fetch.testscript b/tests/fetch.testscript index 9ffd7aa..08ede11 100644 --- a/tests/fetch.testscript +++ b/tests/fetch.testscript @@ -35,9 +35,9 @@ deinit += -d prj depends: libbar EOI - $* 2>>/"EOE"; - fetching dir:$~/libbar \(complements dir:$~/prj\) - fetching dir:$~/libfoo \(prerequisite of dir:$~/prj\) + $* 2>>/~%EOE%; + %fetching dir:.+/libbar \(complements dir:.+/prj\)% + %fetching dir:.+/libfoo \(prerequisite of dir:.+/prj\)% EOE $status libfoo libbar >>~%EOO%; diff --git a/tests/status.testscript b/tests/status.testscript index 49b5412..bf4339b 100644 --- a/tests/status.testscript +++ b/tests/status.testscript @@ -82,10 +82,10 @@ deinit += -d prj depends: libprj EOI - $* --recursive >>EOO 2>>/"EOE"; # Note: implicitly fetches in cfg. + $* --recursive >>EOO 2>>/~%EOE%; # Note: implicitly fetches in cfg. prj configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.19700101000000#1 EOO - fetching dir:$~/libprj \(prerequisite of dir:$~/prj\) + %fetching dir:.+/libprj \(prerequisite of dir:.+/prj\)% EOE $sync; diff --git a/tests/sync.testscript b/tests/sync.testscript index 68a4c70..c03abbb 100644 --- a/tests/sync.testscript +++ b/tests/sync.testscript @@ -50,10 +50,10 @@ deinit += -d prj } EOI - $* -d prj 2>>/~"%EOE%"; - fetching dir:$~/libprj \(prerequisite of dir:$~/prj\) + $* -d prj 2>>/~%EOE%; + %fetching dir:.+/libprj \(prerequisite of dir:.+/prj\)% synchronizing: - % new libprj.+ \\\(required by prj\\\)% + % new libprj.+ \(required by prj\)% % upgrade prj.+19700101000000#1% EOE @@ -130,15 +130,15 @@ deinit += -d prj # Sync the default (cfg1) configuration (via the package directory). # - $* -d prj/pkg2 2>>/~"%EOE%"; - fetching dir:$~/libprj \(prerequisite of dir:$~/prj\) + $* -d prj/pkg2 2>>/~%EOE%; + %fetching dir:.+/libprj \(prerequisite of dir:.+/prj\)% synchronizing: - % new libprj.+ \\\(required by pkg1\\\)% + % new libprj.+ \(required by pkg1\)% % upgrade pkg1.+19700101000000#1% % upgrade pkg2.+19700101000000#1% EOE - $status >>~%EOO% 2>>/~"%EOE%"; # Note: implicitly fetches into cfg2. + $status >>~%EOO% 2>>/~%EOE%; # Note: implicitly fetches into cfg2. in configuration @cfg1: pkg1 configured 0.1.0-a.0.19700101000000#1 % libprj configured 0.+% @@ -148,7 +148,7 @@ deinit += -d prj pkg1 configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.19700101000000#1 pkg2 configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.19700101000000#1 EOO - fetching dir:$~/libprj \(prerequisite of dir:$~/prj\) + %fetching dir:.+/libprj \(prerequisite of dir:.+/prj\)% EOE # Sync all configurations (via the project directory). diff --git a/tests/test.testscript b/tests/test.testscript index 88dadaf..1079ccf 100644 --- a/tests/test.testscript +++ b/tests/test.testscript @@ -77,22 +77,22 @@ deinit += -d prj tags: c++ EOI - $* -d prj/pkg2 2>>/~"%EOE%"; # Default (cfg1). - fetching dir:$~/libprj \(prerequisite of dir:$~/prj\) + $* -d prj/pkg2 2>>/~%EOE%; # Default (cfg1). + %fetching dir:.+/libprj \(prerequisite of dir:.+/prj\)% synchronizing: - % new libprj.+ \\\(required by pkg1\\\)% + % new libprj.+ \(required by pkg1\)% % upgrade pkg1.+19700101000000#1% % upgrade pkg2.+19700101000000#1% - %\(mkdir|c\\+\\+|ld|test\) .+%{4} + %(mkdir|c\+\+|ld|test) .+%{4} EOE - $* @cfg2 -d prj/pkg2 2>>/~"%EOE%"; # By name (cfg2). - fetching dir:$~/libprj \(prerequisite of dir:$~/prj\) + $* @cfg2 -d prj/pkg2 2>>/~%EOE%; # By name (cfg2). + %fetching dir:.+/libprj \(prerequisite of dir:.+/prj\)% synchronizing: - % new libprj.+ \\\(required by pkg1\\\)% + % new libprj.+ \(required by pkg1\)% % upgrade pkg1.+19700101000000#1% % upgrade pkg2.+19700101000000#1% - %\(mkdir|c\\+\\+|ld|test\) .+%{4} + %(mkdir|c\+\+|ld|test) .+%{4} EOE $* -a --recursive -d prj/pkg1 2>>~%EOE% # All configs recursive. |