From cddf72893dcfe862a1ba01572e27076c98105076 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sun, 8 Nov 2015 10:47:23 +0000 Subject: groupling tests that now pass --- regress/usr.bin/make/Makefile | 8 ++++++-- regress/usr.bin/make/mk39 | 10 ++++++++++ regress/usr.bin/make/t43.out | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 regress/usr.bin/make/mk39 create mode 100644 regress/usr.bin/make/t43.out (limited to 'regress/usr.bin') diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile index 8f86b2ccd4a..1c5c6be8d3e 100644 --- a/regress/usr.bin/make/Makefile +++ b/regress/usr.bin/make/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.38 2014/12/08 03:43:12 jsg Exp $ +# $OpenBSD: Makefile,v 1.39 2015/11/08 10:47:22 espie Exp $ # We don't pass t7, t13, t14, t17, t19, t20 t21 t26 # and t16 yields piss poor performance REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 \ t13 t14 t15 t16 t17 t18 t19 t20 t21 t22 t23 t24 \ t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 \ - t37 t38 t38j t39 t40 t41 t42 + t37 t38 t38j t39 t40 t41 t42 t43 MALLOC_OPTIONS?=AJ t1: t1.out @@ -171,6 +171,10 @@ t41: t42: if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk38 2>/dev/null || test $$? -ge 128; then false; fi +t43: + cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -j2 -f mk39 b 2>&1 | diff - t43.out + + t1.out: echo MACHINE_ARCH=${MACHINE_ARCH} >$@ diff --git a/regress/usr.bin/make/mk39 b/regress/usr.bin/make/mk39 new file mode 100644 index 00000000000..59328e12d0a --- /dev/null +++ b/regress/usr.bin/make/mk39 @@ -0,0 +1,10 @@ +# $OpenBSD: mk39,v 1.1 2015/11/08 10:47:22 espie Exp $ + +# duplicate target in list, may fuck up groupling + +a b c a: + @echo "Did it work" + +# wildcards that don't expend to anything, empty target list +*/*.hqueue: + @echo this has no target diff --git a/regress/usr.bin/make/t43.out b/regress/usr.bin/make/t43.out new file mode 100644 index 00000000000..a6b6cae3f91 --- /dev/null +++ b/regress/usr.bin/make/t43.out @@ -0,0 +1 @@ +Did it work -- cgit v1.2.3