changeset 23883:b3b136bc7ce2

shorten messages displayed at end of make check * __run_test_suite__.m: Shorten summary messages. * test/module.mk: Silence run-octave-tests unless V=1.
author John W. Eaton <jwe@octave.org>
date Fri, 11 Aug 2017 09:43:02 -0400
parents 8e61b91f2e24
children bd9e719f04cc
files scripts/testfun/__run_test_suite__.m test/module.mk
diffstat 2 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/testfun/__run_test_suite__.m	Fri Aug 11 09:10:35 2017 -0400
+++ b/scripts/testfun/__run_test_suite__.m	Fri Aug 11 09:43:02 2017 -0400
@@ -99,19 +99,17 @@
       printf ("See the file %s for additional details.\n", logfile);
       if (dxf > 0 || dxb > 0)
         puts ("\n");
-        puts ("Items listed as XFAIL above are expected failures or\n");
-        puts ("bugs that have already been reported.  Bug report numbers\n");
-        puts ("for them may be found in the log file:\n");
+        puts ("XFAIL items are expected failures or known bugs.\n");
+        puts ("Bug report numbers may be found in the log file:\n");
         puts (logfile);
         puts ("\nPlease help improve Octave by contributing fixes for them.\n");
       endif
       if (dsk > 0 || drtsk > 0)
         puts ("\n");
-        puts ("Tests are most often skipped because the features they require\n");
-        puts ("have been disabled.  Features are most often disabled because\n");
-        puts ("they require dependencies that were not present when Octave\n");
-        puts ("was built.  The configure script should have printed a summary\n");
-        puts ("at the end of its run indicating which dependencies were not found.\n");
+        puts ("Tests are often skipped because required features were\n");
+        puts ("disabled or were not present when Octave was built.\n");
+        puts ("The configure script should have printed a summary\n");
+        puts ("indicating which dependencies were not found.\n");
       endif
 
       ## Weed out deprecated and private functions
--- a/test/module.mk	Fri Aug 11 09:10:35 2017 -0400
+++ b/test/module.mk	Fri Aug 11 09:43:02 2017 -0400
@@ -75,7 +75,7 @@
 	@$(gdbinit_install_rule)
 
 define run-octave-tests
-  cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) $(1) --norc --silent --no-history $(abs_top_srcdir)/%reldir%/fntests.m $(abs_top_srcdir)/test
+  cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) $(1) --norc --silent --no-history $(abs_top_srcdir)/%reldir%/fntests.m $(abs_top_srcdir)/test; \
   if $(AM_V_P); then \
     echo ""; \
     if [ -f %reldir%/fntests.log ]; then \
@@ -89,11 +89,11 @@
 endef
 
 check-local: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) %reldir%/$(octave_dirstamp)
-	$(call run-octave-tests)
+	$(AM_V_at)$(call run-octave-tests)
 
 if AMCOND_HAVE_LLVM
 check-jit: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) %reldir%/$(octave_dirstamp)
-	$(call run-octave-tests,--jit-compiler)
+	$(AM_V_at)$(call run-octave-tests,--jit-compiler)
 endif
 
 COVERAGE_DIR = %reldir%/coverage