From 48b997c0291ed2d3d4c28de0daeb31b75c91b1b6 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 21 Aug 2018 15:18:15 +0300 Subject: Fix testscripts broken due to build2 output change --- tests/pkg-update.test | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'tests/pkg-update.test') 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%; -- cgit v1.1