Mercurial > jwe > octave

changeset 23278:eb19c1545fb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
display fntests.log at end of make check if V=1 * test/module.mk (run-octave-tests): New macro. Optionally display fntests.log file. (check-local, check-jit): Use new macro.
author John W. Eaton <jwe@octave.org>
date Wed, 15 Mar 2017 12:43:07 -0400
parents df0fb2cb820b
children 67d741321e21
files test/module.mk
diffstat 1 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/module.mk	Wed Mar 15 09:13:38 2017 -0400
+++ b/test/module.mk	Wed Mar 15 12:43:07 2017 -0400
@@ -65,12 +65,26 @@
 test/.gdbinit: etc/gdbinit
 	@$(gdbinit_install_rule)
 
+define run-octave-tests
+  cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) $(1) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
+  if $(AM_V_P); then \
+    echo ""; \
+    if [ -f test/fntests.log ]; then \
+      echo "Contents of test/fntests.log:"; \
+      echo ""; \
+      cat test/fntests.log; \
+    else \
+      echo "test/fntests.log is missing!"; \
+    fi; \
+  fi
+endef
+
 check-local: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
-	cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
+	$(call run-octave-tests)
 
 if AMCOND_HAVE_LLVM
 check-jit: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp)
-	cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test
+	$(call run-octave-tests,--jit-compiler)
 endif
 
 COVERAGE_DIR = test/coverage