From owner-svn-src-head@FreeBSD.ORG  Wed Mar 12 10:38:33 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6E57E665;
 Wed, 12 Mar 2014 10:38:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5B43B9D5;
 Wed, 12 Mar 2014 10:38:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CAcXat021795;
 Wed, 12 Mar 2014 10:38:33 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CAcXKu021794;
 Wed, 12 Mar 2014 10:38:33 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201403121038.s2CAcXKu021794@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Wed, 12 Mar 2014 10:38:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263082 - head/tools/regression/usr.bin/make
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Mar 2014 10:38:33 -0000

Author: jmmv
Date: Wed Mar 12 10:38:32 2014
New Revision: 263082
URL: http://svnweb.freebsd.org/changeset/base/263082

Log:
  Only run the make tests when make is fmake.
  
  Because bmake is the default make being built, many of the tests here
  fail due to differences between the two.  Just skip the tests for now
  when using fmake.

Modified:
  head/tools/regression/usr.bin/make/common.sh

Modified: head/tools/regression/usr.bin/make/common.sh
==============================================================================
--- head/tools/regression/usr.bin/make/common.sh	Wed Mar 12 10:35:22 2014	(r263081)
+++ head/tools/regression/usr.bin/make/common.sh	Wed Mar 12 10:38:32 2014	(r263082)
@@ -13,6 +13,13 @@ fatal()
 	exit 1
 }
 
+make_is_fmake() {
+	# This test is not very reliable but works for now: the old fmake
+	# does have a -v option while bmake doesn't.
+	${MAKE_PROG} -f Makefile.non-existent -v 2>&1 | \
+	    grep -q "cannot open.*non-existent"
+}
+
 #
 # Check whether the working directory exists - it must.
 #
@@ -322,19 +329,25 @@ eval_compare()
 	while [ ${N} -le ${TEST_N} ] ; do
 		fail=
 		todo=
+		skip=
 		if ! skip_test ${N} ; then
 			do_compare stdout ${N} || fail="${fail}stdout "
 			do_compare stderr ${N} || fail="${fail}stderr "
 			do_compare status ${N} || fail="${fail}status "
 			eval todo=\${TEST_${N}_TODO}
+		else
+			eval skip=\${TEST_${N}_SKIP}
 		fi
 		if [ ! -z "$fail" ]; then
 			echo -n "not "
 		fi
 		echo -n "ok ${N} ${SUBDIR}/${N}"
-		if [ ! -z "$fail" -o ! -z "$todo" ]; then
+		if [ ! -z "$fail" -o ! -z "$todo" -o ! -z "$skip" ]; then
 			echo -n " # "
 		fi
+		if [ ! -z "$skip" ] ; then
+			echo -n "skip $skip; "
+		fi
 		if [ ! -z "$todo" ] ; then
 			echo -n "TODO $todo; "
 		fi
@@ -473,6 +486,12 @@ eval_cmd()
 		set -- prove
 	fi
 
+	if ! make_is_fmake ; then
+		for i in $(jot ${TEST_N:-1}) ; do
+			eval TEST_${i}_SKIP=\"make is not fmake\"
+		done
+	fi
+
 	for i
 	do
 		case $i in