[build] Makefile changes: print time for tests; dash-compatibility change (kaldi-asr#1322)

danpovey · web-flow · commit 5cdbd1879747 · 2017-01-07T12:48:51.000-08:00
diff --git a/src/makefiles/default_rules.mk b/src/makefiles/default_rules.mk
@@ -78,16 +78,20 @@ test: test_compile
 	@{ result=0;			\
 	for x in $(TESTFILES); do	\
 	  printf "Running $$x ...";	\
+      timestamp1=$$(date +"%s"); \
 	  ./$$x >$$x.testlog 2>&1;	\
-	  if [ $$? -ne 0 ]; then	\
-	    echo "... FAIL $$x";	\
+      ret=$$? \
+      timestamp2=$$(date +"%s"); \
+      time_taken=$$[timestamp2-timestamp1]; \
+	  if [ $$ret -ne 0 ]; then \
+	    echo " $${time_taken}s... FAIL $$x"; \
 	    result=1;			\
 	    if [ -n "$TRAVIS" ] && [ -f core ] && command -v gdb >/dev/null 2>&1; then	\
 	      gdb $$x core -ex "thread apply all bt" -batch >>$$x.testlog 2>&1;		\
 	      rm -rf core;		\
 	    fi;				\
 	  else				\
-	    echo "... SUCCESS";		\
+	    echo " $${time_taken}s... SUCCESS";		\
 	    rm -f $$x.testlog;		\
 	  fi;				\
 	done;				\
diff --git a/tools/Makefile b/tools/Makefile
@@ -86,7 +86,7 @@ else ifeq ($(OS),Windows_NT)
 	cd openfst-$(OPENFST_VERSION)/; ./configure --prefix=`pwd` --enable-static --enable-shared --enable-far --enable-ngram-fsts CXX=$(CXX) CXXFLAGS="$(CXXFLAGS) -O -Wa,-mbig-obj" LDFLAGS="$(LDFLAGS)" LIBS="-ldl"
 else
 	# ppc64le needs the newsted config.guess to be correctly indentified
-	[ "$(shell uname -p)" == "ppc64le" ] && wget -O openfst-$(OPENFST_VERSION)/config.guess \
+	[ "$(shell uname -p)" = "ppc64le" ] && wget -O openfst-$(OPENFST_VERSION)/config.guess \
 		"http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" || \
 		echo "config.guess unchanged"
 	cd openfst-$(OPENFST_VERSION)/; ./configure --prefix=`pwd` --enable-static --enable-shared --enable-far --enable-ngram-fsts CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="-ldl"
