summaryrefslogtreecommitdiffstats
path: root/usr.bin/bmake/unit-tests/Makefile
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2012-11-16 01:37:25 +0000
committersjg <sjg@FreeBSD.org>2012-11-16 01:37:25 +0000
commitd281294411049c9ca9fad03441663d96ccb73476 (patch)
treef309932499193bc9bb630ead5d6aeb07eeb582a8 /usr.bin/bmake/unit-tests/Makefile
parent48176b8f78106dce8ff54e657c3116365c3506d8 (diff)
parentb9451e8e2e7c949c7a89c32cfed6b2399aef0115 (diff)
downloadFreeBSD-src-d281294411049c9ca9fad03441663d96ccb73476.zip
FreeBSD-src-d281294411049c9ca9fad03441663d96ccb73476.tar.gz
Merge bmake-20121111
Also pay attention to MK_SHARED_TOOLCHAIN. Approved by: marcel (mentor)
Diffstat (limited to 'usr.bin/bmake/unit-tests/Makefile')
-rw-r--r--usr.bin/bmake/unit-tests/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile
index c22dbc5..89c7fe0 100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@ -5,9 +5,9 @@
SRCTOP?= ${.CURDIR:H:H:H}
-# $Id: Makefile.in,v 1.38 2012/06/19 23:38:48 sjg Exp $
+# $Id: Makefile.in,v 1.39 2012/11/09 19:16:10 sjg Exp $
#
-# $NetBSD: Makefile,v 1.34 2012/06/19 23:25:53 sjg Exp $
+# $NetBSD: Makefile,v 1.35 2012/11/09 19:08:28 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -47,6 +47,7 @@ SUBFILES= \
modorder \
modts \
modword \
+ order \
phony-end \
posix \
qequals \
@@ -59,6 +60,7 @@ SUBFILES= \
all: ${SUBFILES}
flags.doterror=
+flags.order=-j1
# the tests are actually done with sub-makes.
.PHONY: ${SUBFILES}
OpenPOWER on IntegriCloud