Merge pull request #515 from Tarsnap/import

Merge changes from kivaloo and spiped.

Makefile

@@ -65,6 +65,7 @@ toplevel:	apisupport-config.h cflags-filter.sh	\
 # For "loop-back" building of a subdirectory
 .PHONY:	buildsubdir
 buildsubdir: toplevel
+	export CFLAGS="$${CFLAGS:-${CFLAGS_DEFAULT}}";	\
 	. ./posix-flags.sh;				\
 	. ./cpusupport-config.h;			\
 	. ./cflags-filter.sh;				\
@@ -75,6 +76,7 @@ buildsubdir: toplevel
 # For "loop-back" building of libraries
 .PHONY:	libs
 libs: apisupport-config.h cflags-filter.sh cpusupport-config.h posix-flags.sh
+	export CFLAGS="$${CFLAGS:-${CFLAGS_DEFAULT}}";	\
 	. ./posix-flags.sh;				\
 	. ./cpusupport-config.h;			\
 	. ./cflags-filter.sh;				\

tests/10-events-interrupt.sh

@@ -31,12 +31,12 @@ scenario_cmd() {
 	) &
 
 	# Wait for the binary to initialize its signal handler
-	wait_while test ! -e "${pidfile}"
+	wait_while 0 test ! -e "${pidfile}"
 	pid=$( cat "${pidfile}" )
 
 	# Signal and wait for the binary to finish writing the logfile
 	kill -s USR1 "${pid}"
-	wait_while test ! -e "${flag_1}"
+	wait_while 0 test ! -e "${flag_1}"
 
 	# Compare with good values
 	setup_check "test-empty-events"

tests/shared_test_functions.sh

@@ -22,8 +22,8 @@
 #   Look for ${cmd} in the ${PATH}, and ensure that it supports ${args}.
 # - has_pid(cmd):
 #   Look for a ${cmd} in $(ps).
-# - wait_while(func):
-#   Wait until ${func} returns non-zero.
+# - wait_while(timeout, func):
+#   Wait up to ${timeout} milliseconds, or until ${func} returns non-zero.
 # - setup_check(description, check_prev):
 #   Set up the below variables.
 # - expected_exitcode(expected, actual):
@@ -133,11 +133,14 @@ has_pid() {
 	return 1
 }
 
-## wait_while(func):
+## wait_while(timeout, func):
 # Wait while ${func} returns 0.  If ${msleep} is defined, use that to wait
-# 100ms; otherwise, wait in 1 second increments.
+# 100ms; otherwise, wait in 1 second increments.  If ${timeout} is non-zero,
+# return 1 if ${timeout} milliseconds have passed.
 wait_while() {
 	_wait_while_ms=0
+	_wait_while_timeout=$1
+	shift 1
 
 	# Check for the ending condition
 	while "$@"; do
@@ -147,6 +150,15 @@ wait_while() {
 			    "${_wait_while_ms}" "$*" 1>&2
 		fi
 
+		# Bail if we've exceeded the timeout
+		if [ "${_wait_while_timeout}" -gt 0 ] &&	\
+		    [ "${_wait_while_ms}" -gt "${_wait_while_timeout}" ]; then
+			if [ "${VERBOSE}" -ne 0 ]; then
+				printf "Bail; timeout exceeded\n" 1>&2
+			fi
+			return 1
+		fi
+
 		# Wait using the appropriate binary
 		if [ -n "${msleep:-}" ]; then
 			"${msleep}" 100