diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2014-01-06 12:31:57 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2014-01-06 12:31:57 +0000 |
| commit | b748d53e5003700b55ad6a23943283115952644a (patch) | |
| tree | ca16c1c75e911a8fe2aa648a0f28b7d210359cc1 | |
| parent | 249e2c8764a8698a7fc5d17b73603ae58bd00437 (diff) | |
turn mk34 into a proper full-fledged test.
forgot to link t37 into the build
| -rw-r--r-- | regress/usr.bin/make/Makefile | 14 | ||||
| -rw-r--r-- | regress/usr.bin/make/mk34 | 11 | ||||
| -rw-r--r-- | regress/usr.bin/make/t38.out | 1 |
3 files changed, 20 insertions, 6 deletions
diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile index cc1eb28bcef..3e6b6505b80 100644 --- a/regress/usr.bin/make/Makefile +++ b/regress/usr.bin/make/Makefile @@ -1,8 +1,11 @@ -# $OpenBSD: Makefile,v 1.33 2012/08/20 08:33:50 espie Exp $ +# $OpenBSD: Makefile,v 1.34 2014/01/06 12:31:56 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 +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 MALLOC_OPTIONS?=AZJ t1: t1.out @@ -150,12 +153,17 @@ z.a: t37: if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=2 ${MAKE} -r -f mk33 all; then false; else true; fi +t38: + cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=2 ${MAKE} -r -f mk34 | diff - t38.out + +t38j: + cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} B=2 ${MAKE} -r -f mk34 -j2 | diff - t38.out t1.out: echo MACHINE_ARCH=${MACHINE_ARCH} >$@ .PHONY: ${REGRESS_TARGETS} regress -CLEANFILES+=t1.out z.a a.a a.b goodfile phony t15file \ +CLEANFILES+=t1.out z.a a.a a.b mk34.b goodfile phony t15file \ t25.1st t25.2nd f26.2nd f26 t27.2nd t27.3rd \ libt29.a t29dep t29.targ t29.targ2 diff --git a/regress/usr.bin/make/mk34 b/regress/usr.bin/make/mk34 index e395baf7921..3b4628a784e 100644 --- a/regress/usr.bin/make/mk34 +++ b/regress/usr.bin/make/mk34 @@ -1,5 +1,10 @@ -# $OpenBSD: mk34,v 1.1 2013/12/26 10:25:07 espie Exp $ +# $OpenBSD: mk34,v 1.2 2014/01/06 12:31:56 espie Exp $ # should produce similar error message with -j and without -j -thing.o: ${.PREFIX}.vis - @echo trythis +t38.a: ${.PREFIX}.b + @echo okay + +t38.b: + @touch $@ + +.SUFFIXES: .a .b diff --git a/regress/usr.bin/make/t38.out b/regress/usr.bin/make/t38.out new file mode 100644 index 00000000000..dcf02b2fb6b --- /dev/null +++ b/regress/usr.bin/make/t38.out @@ -0,0 +1 @@ +okay |