diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2019-07-11 07:15:03 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2019-07-11 07:15:03 +0000 |
| commit | 528ff16e277d4ed634bea2c31fe299e3d2ae3ea6 (patch) | |
| tree | 7fe7b81d301f9cc72f9ddb63213b73610d333f68 /regress | |
| parent | b156989e58922ae4b0f378b5ba621aaf48dbad13 (diff) | |
tweak tests to match simpler behavior
also actually check the return code now that it makes sense
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.sbin/pkg_add/Makefile | 10 | ||||
| -rw-r--r-- | regress/usr.sbin/pkg_add/temp1.ref | 4 | ||||
| -rw-r--r-- | regress/usr.sbin/pkg_add/temp2.ref | 4 | ||||
| -rw-r--r-- | regress/usr.sbin/pkg_add/temp3.ref | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 400a614c1f0..4052dc1a4f3 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.72 2019/07/10 11:55:40 espie Exp $ +# $OpenBSD: Makefile,v 1.73 2019/07/11 07:15:02 espie Exp $ REGRESS_TARGETS=pkgnames pkgpaths signatures depends-check longnames pkgcfl \ collision-check1 collision-check2 collision-check3 \ @@ -775,12 +775,12 @@ XXXBASE=temp2 temp-error1: rep0/a-0.tgz rep0/b-0.tgz temp1.ref @-rm -rf ${D40} - @{ INJECT=inject-temp1 ROOT=${D40} SILENT=1 ${ADD_PKG} rep0/a-0.tgz 1>/dev/null|| echo okay ; } 2>&1|${SED_PIPE} >temp1.out + @{ INJECT=inject-temp1 ROOT=${D40} SILENT=1 ${ADD_PKG} rep0/a-0.tgz 1>/dev/null|| echo $$? ; } 2>&1|${SED_PIPE} >temp1.out @diff -u temp1.out ${.CURDIR}/temp1.ref temp-error2: @-rm -rf ${XXXD} - @{ INJECT=inject-temp2 ROOT=${XXXD} SILENT=1 PKG_PATH=https://www.google.com/ ${ADD_PKG} rep0/a-0.tgz 1>/dev/null|| echo okay ; } 2>&1|${SED_PIPE2} >${XXXBASE}.out + @{ INJECT=inject-temp2 ROOT=${XXXD} SILENT=1 PKG_PATH=https://www.google.com/ ${ADD_PKG} rep0/a-0.tgz 1>/dev/null|| echo $$? ; } 2>&1|${SED_PIPE2} >${XXXBASE}.out @diff -u ${XXXBASE}.out ${.CURDIR}/temp2.ref temp-error2-as-root: @@ -789,7 +789,7 @@ temp-error2-as-root: temp-error3: rep1/d-0.tgz temp3.ref @-rm -rf ${D42} - @{ INJECT=inject-temp3 ROOT=${D42} SILENT=1 ${ADD_PKG} rep1/d-0.tgz 1>/dev/null|| echo okay; } 2>&1|${SED_PIPE} >temp3.out + @{ INJECT=inject-temp3 ROOT=${D42} SILENT=1 ${ADD_PKG} rep1/d-0.tgz 1>/dev/null|| echo $$?; } 2>&1|${SED_PIPE} >temp3.out @diff -u temp3.out ${.CURDIR}/temp3.ref temp-error4: rep0/qt-0.tgz rep1/qt-1.tgz @@ -797,7 +797,7 @@ temp-error4: rep0/qt-0.tgz rep1/qt-1.tgz @ROOT=${D43} SILENT=1 ${ADD_PKG} rep0/qt-0.tgz @rm -f ${D43}/usr/local/phonon/a @echo zoinx >${D43}/usr/local/phonon/a - @{ INJECT=inject-temp4 PKG_PATH=${.OBJDIR}/rep1 SILENT=1 ROOT=${D43} ${ADD_PKG} -Dchecksum -u qt || echo okay; } 2>&1|${SED_PIPE} >temp4.out + @{ INJECT=inject-temp4 PKG_PATH=${.OBJDIR}/rep1 SILENT=1 ROOT=${D43} ${ADD_PKG} -Dchecksum -u qt || echo $$?; } 2>&1|${SED_PIPE} >temp4.out .PHONY: ${REGRESS_TARGETS} diff --git a/regress/usr.sbin/pkg_add/temp1.ref b/regress/usr.sbin/pkg_add/temp1.ref index 9876f9af3fa..8af2d67aab6 100644 --- a/regress/usr.sbin/pkg_add/temp1.ref +++ b/regress/usr.sbin/pkg_add/temp1.ref @@ -1,2 +1,2 @@ -Fatal error: User USER couldn't create temp dir as /nonexistent/pkginfo.XXXXXXXXXX: No such file or directory -okay +pkg_add: User USER couldn't create temp dir as /nonexistent/pkginfo.XXXXXXXXXX: No such file or directory +1 diff --git a/regress/usr.sbin/pkg_add/temp2.ref b/regress/usr.sbin/pkg_add/temp2.ref index fa613110431..4b8955f27d0 100644 --- a/regress/usr.sbin/pkg_add/temp2.ref +++ b/regress/usr.sbin/pkg_add/temp2.ref @@ -1,2 +1,2 @@ -Fatal error: User USER couldn't create temp file as /nonexistent/session.XXXXXXXXXX: No such file or directory -okay +pkg_add: User USER couldn't create temp file as /nonexistent/session.XXXXXXXXXX: No such file or directory +1 diff --git a/regress/usr.sbin/pkg_add/temp3.ref b/regress/usr.sbin/pkg_add/temp3.ref index 738c45edf4c..f70adaca92a 100644 --- a/regress/usr.sbin/pkg_add/temp3.ref +++ b/regress/usr.sbin/pkg_add/temp3.ref @@ -1,2 +1,2 @@ -Fatal error: User USER couldn't create temp file as /nonexistent/pkg.XXXXXXXXXX: No such file or directory -okay +pkg_add: User USER couldn't create temp file as /nonexistent/pkg.XXXXXXXXXX: No such file or directory +1 |