diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-08-21 15:18:15 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-08-21 15:18:15 +0300 |
| commit | 48b997c0291ed2d3d4c28de0daeb31b75c91b1b6 (patch) | |
| tree | 4649de0466c1105a22d8c346a5a653eb4a8f8c5d | |
| parent | 603d8ce4c3c3aacd2028bd1fb4596d8fef7ca549 (diff) | |
Fix testscripts broken due to build2 output change
| -rw-r--r-- | tests/pkg-build.test | 13 | ||||
| -rw-r--r-- | tests/pkg-update.test | 18 |
2 files changed, 5 insertions, 26 deletions
diff --git a/tests/pkg-build.test b/tests/pkg-build.test index 7cf0375..10908bf 100644 --- a/tests/pkg-build.test +++ b/tests/pkg-build.test @@ -3138,10 +3138,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! disfigured libhello/1.0.0 using libhello/1.0.1 (external) configured libhello/1.0.1 - %mkdir .+%+ - %c\+\+ .+%+ - %ld .+%+ - updated libhello/1.0.1 + %(mkdir|c\+\+|ld|ar|updated) .+%{9} EOE } @@ -3242,9 +3239,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! fetched libhello/1.0.1 unpacked libhello/1.0.1 configured libhello/1.0.1 - %c\+\+ .+%+ - %ld .+%+ - updated libhello/1.0.1 + %(c\+\+|ld|ar|updated) .+%{7} EOE test -d cfg/libhello-1.0.1/; @@ -3267,9 +3262,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! $* libhello 2>>~%EOE%; configured libhello/1.0.1 - %c\+\+ .+%+ - %ld .+%+ - updated libhello/1.0.1 + %(c\+\+|ld|ar|updated) .+%{7} EOE test -d cfg/libhello-1.0.1/; diff --git a/tests/pkg-update.test b/tests/pkg-update.test index 295aac4..a868ea2 100644 --- a/tests/pkg-update.test +++ b/tests/pkg-update.test @@ -104,13 +104,7 @@ $* 2>>EOE != 0 $pkg_configure libhello; $* $j1 libhello 2>>~%EOE%; - %c\+\+ .+% - %ld .+% - %c\+\+ .+% - %ld .+% - %c\+\+ .+% - %ld .+% - updated libhello/1.0.0 + %(c\+\+|ar|ld|updated) .+%{7} EOE $* libhello 2>>~%EOE%; @@ -130,15 +124,7 @@ $* 2>>EOE != 0 $pkg_unpack -e $src/libhello-1.0.0 && $pkg_configure libhello; $* $j1 libhello 2>>~%EOE%; - %mkdir .+% - %mkdir .+% - %c\+\+ .+% - %ld .+% - %c\+\+ .+% - %ld .+% - %c\+\+ .+% - %ld .+% - updated libhello/1.0.0 + %(mkdir|c\+\+|ar|ld|updated) .+%{9} EOE $* libhello 2>>~%EOE%; |