Mercurial > octave-nkf

changeset 20343:bacaec9b5535

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive make invocation in test directory tree * test/module.mk: New file created from test/Makefile.am, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-44940/module.mk, test/class-concat/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, and test/nest/module.mk. * test/Makefile.am, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-44940/module.mk, test/class-concat/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, test/nest/module.mk: Delete. * configure.ac (AC_OUTPUT): Don't generate test/Makefile. * Makefile.am: Include test/module.mk. * build-aux/common.mk, test/build-bc-overload-tests.sh: Adapt to changes in Makefile structure.
author John W. Eaton <jwe@octave.org>
date Tue, 07 Jul 2015 10:40:38 -0400
parents c3c1fb44f9b5
children 822bc711359a
files Makefile.am build-aux/common.mk configure.ac test/Makefile.am test/bug-35448/module.mk test/bug-36025/module.mk test/bug-38236/module.mk test/bug-38691/module.mk test/bug-44940/module.mk test/build-bc-overload-tests.sh test/class-concat/module.mk test/classdef/module.mk test/classes/module.mk test/ctor-vs-method/module.mk test/fcn-handle-derived-resolution/module.mk test/nest/module.mk
diffstat 16 files changed, 16 insertions(+), 361 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri Jul 03 19:33:19 2015 -0400
+++ b/Makefile.am	Tue Jul 07 10:40:38 2015 -0400
@@ -58,6 +58,7 @@
 MAINTAINERCLEANFILES =
 info_TEXINFOS =
 BUILT_SOURCES =
+TEST_FILES =
 
 IMAGES_SRC =
 IMAGES_EPS =
@@ -70,6 +71,7 @@
 include etc/module.mk
 include examples/module.mk
 include m4/module.mk
+include test/module.mk
 
 # Subdirectories in which to run make recursively.  Other
 # directories are handled directly from this Makefile (see also the
@@ -79,7 +81,7 @@
 if AMCOND_BUILD_GUI
 SUBDIRS += libgui
 endif
-SUBDIRS += src scripts test
+SUBDIRS += src scripts
 
 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
 
@@ -134,14 +136,6 @@
 	@echo "   make install    - to install (PREFIX=$(prefix))"
 	@echo ""
 
-check: all
-	$(MAKE) -C test check
-
-if AMCOND_HAVE_LLVM
-check-jit: all
-	$(MAKE) -C test check-jit
-endif
-
 run-octave: run-octave.in Makefile
 	$(AM_V_GEN)$(do_subst_script_vals) && \
 	chmod a+rx "$@"
--- a/build-aux/common.mk	Fri Jul 03 19:33:19 2015 -0400
+++ b/build-aux/common.mk	Tue Jul 07 10:40:38 2015 -0400
@@ -929,10 +929,10 @@
 endef
 
 define gdbinit_install_rule
-  if [ -f .gdbinit ]; then \
-    echo "refusing to overwrite .gdbinit with newer version from $<" 1>&2; \
+  if [ -f $@ ]; then \
+    echo "refusing to overwrite $@ with newer version from $<" 1>&2; \
   else \
-    echo "Installing .gdbinit from version at $<" ; \
+    echo "Installing $@ from version at $<" ; \
     cp $< $@; \
   fi
 endef
--- a/configure.ac	Fri Jul 03 19:33:19 2015 -0400
+++ b/configure.ac	Tue Jul 07 10:40:38 2015 -0400
@@ -3003,8 +3003,7 @@
   liboctave/Makefile
   liboctave/cruft/mkf77def
   scripts/Makefile
-  src/Makefile
-  test/Makefile])
+  src/Makefile])
 
 AC_OUTPUT
 
--- a/test/Makefile.am	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-# Makefile for Octave's test directory
-#
-# Copyright (C) 1994-2015 John W. Eaton
-#
-# This file is part of Octave.
-#
-# Octave is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at
-# your option) any later version.
-#
-# Octave is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Octave; see the file COPYING.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-include $(top_srcdir)/build-aux/common.mk
-
-FCN_FILES = \
-  fntests.m \
-  args.tst \
-  bug-31371.tst \
-  bug-38576.tst \
-  colormaps.tst \
-  complex.tst \
-  diag-perm.tst \
-  error.tst \
-  eval-catch.tst \
-  for.tst \
-  func.tst \
-  global.tst \
-  if.tst \
-  index.tst \
-  io.tst \
-  jit.tst \
-  line-continue.tst \
-  logical-index.tst \
-  null-assign.tst \
-  parser.tst \
-  prefer.tst \
-  range.tst \
-  recursion.tst \
-  return.tst \
-  slice.tst \
-  struct.tst \
-  switch.tst \
-  system.tst \
-  transpose.tst \
-  try.tst \
-  unwind.tst \
-  while.tst
-
-include bug-35448/module.mk
-include bug-36025/module.mk
-include bug-38236/module.mk
-include bug-38691/module.mk
-include bug-44940/module.mk
-include classdef/module.mk
-include classes/module.mk
-include class-concat/module.mk
-include ctor-vs-method/module.mk
-include fcn-handle-derived-resolution/module.mk
-include nest/module.mk
-
-all-local: .gdbinit
-
-.gdbinit: ../etc/gdbinit
-	@$(gdbinit_install_rule)
-
-check: sparse.tst bc-overload-tests.stamp
-	$(top_builddir)/run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(srcdir)/fntests.m $(srcdir)
-
-if AMCOND_HAVE_LLVM
-check-jit: sparse.tst bc-overload-tests.stamp
-	$(top_builddir)/run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(srcdir)/fntests.m $(srcdir)
-endif
-
-sparse.tst: build-sparse-tests.sh
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	$(srcdir)/build-sparse-tests.sh > $@-t && \
-	mv $@-t $@
-
-GENERATED_BC_OVERLOADS_DIRS := \
-  $(shell $(srcdir)/build-bc-overload-tests.sh --list-dirs)
-
-GENERATED_BC_OVERLOADS_FILES := \
-  $(shell $(srcdir)/build-bc-overload-tests.sh --list-files)
-
-bc-overload-tests.stamp: build-bc-overload-tests.sh bc-overloads-expected
-	$(AM_V_GEN)rm -f $@ && \
-	$(srcdir)/build-bc-overload-tests.sh $(top_builddir)/test $(srcdir)/bc-overloads-expected && \
-	touch $@
-
-BUILT_SOURCES = bc-overload-tests.stamp
-
-EXTRA_DIST = \
-  build-sparse-tests.sh \
-  build-bc-overload-tests.sh \
-  bc-overloads-expected \
-  build_bc_overloads_expected.m \
-  $(FCN_FILES)
-
-CLEANFILES = \
-  sparse.tst \
-  bc-overload-tests.stamp \
-  $(GENERATED_BC_OVERLOADS_FILES)
-
-DISTCLEANFILES = \
-  .gdbinit \
-  fntests.log
-
-fixedtestsdir := $(octtestsdir)/fixed
-
-nobase_fixedtests_DATA = \
-  sparse.tst \
-  $(GENERATED_BC_OVERLOADS_FILES) \
-  $(filter-out fntests.m, $(FCN_FILES))
-
-clean-local:
-	-rm -rf $(GENERATED_BC_OVERLOADS_DIRS)
--- a/test/bug-35448/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-bug_35448_FCN_FILES = \
-  bug-35448/fA.m \
-  bug-35448/fB.m \
-  bug-35448/fC.m \
-  bug-35448/bug-35448.tst
-
-FCN_FILES += $(bug_35448_FCN_FILES)
--- a/test/bug-36025/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-bug_36025_FCN_FILES = \
-  bug-36025/@testclass/one.m \
-  bug-36025/@testclass/testclass.m \
-  bug-36025/@testclass/two.m \
-  bug-36025/bug-36025.tst
-
-FCN_FILES += $(bug_36025_FCN_FILES)
--- a/test/bug-38236/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-bug_38236_FCN_FILES = \
-  bug-38236/df_vr.m \
-  bug-38236/u_vr.m \
-  bug-38236/bug-38236.tst
-
-FCN_FILES += $(bug_38236_FCN_FILES)
--- a/test/bug-38691/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-bug_38691_FCN_FILES = \
-  bug-38691/dir1/func1.m \
-  bug-38691/dir2/func1.m \
-  bug-38691/dir2/func2.m \
-  bug-38691/dir2/func3.m \
-  bug-38691/bug-38691.tst
-
-FCN_FILES += $(bug_38691_FCN_FILES)
--- a/test/bug-44940/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-bug_44940_FCN_FILES = \
-  bug-44940/bug-44940.tst \
-  bug-44940/class_bug44940.m
-
-FCN_FILES += $(bug_44940_FCN_FILES)
--- a/test/build-bc-overload-tests.sh	Fri Jul 03 19:33:19 2015 -0400
+++ b/test/build-bc-overload-tests.sh	Tue Jul 07 10:40:38 2015 -0400
@@ -36,19 +36,21 @@
   function_handle
 "
 
-if [ $# -eq 1 ]; then
+if [ $# -eq 2 ]; then
+  output_dir="$1"
+  shift
   case "$1" in
     --list-files)
-      echo tbcover.m
-      echo bc-overloads.tst
+      echo $output_dir/tbcover.m
+      echo $output_dir/bc-overloads.tst
       for class in $CLASSES; do
-        echo @$class/tbcover.m
+        echo $output_dir/@$class/tbcover.m
       done
       exit
     ;;
     --list-dirs)
       for class in $CLASSES; do
-        echo @$class
+        echo $output_dir/@$class
       done
       exit
     ;;
@@ -57,15 +59,11 @@
       exit
     ;;
     *)
-      echo "usage: build-bc-overload-tests.sh option" 1>&2
-      exit 1
+      expected_results_file="$1"
     ;;
   esac
-elif [ $# -eq 2 ]; then
-    output_dir="$1"
-    expected_results_file="$2"
 else
-  echo "usage: build-bc-overload-tests.sh expected-results-file" 1>&2
+  echo "usage: build-bc-overload-tests.sh output_dir option" 1>&2
   exit 1
 fi
 
--- a/test/class-concat/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-class_concat_FCN_FILES = \
-  class-concat/@foo/foo.m \
-  class-concat/class-concat.tst
-
-FCN_FILES += $(class_concat_FCN_FILES)
--- a/test/classdef/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-classdef_FCN_FILES = \
-  classdef/foo_method_changes_property_size.m \
-  classdef/foo_static_method_constant_property.m \
-  classdef/foo_value_class.m \
-  classdef/classdef.tst
-
-FCN_FILES += $(classdef_FCN_FILES)
--- a/test/classes/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-class_Blork_FCN_FILES = \
-  classes/@Blork/Blork.m \
-  classes/@Blork/bleek.m \
-  classes/@Blork/display.m \
-  classes/@Blork/get.m \
-  classes/@Blork/set.m
-
-class_Cork_FCN_FILES = \
-  classes/@Cork/Cork.m \
-  classes/@Cork/click.m \
-  classes/@Cork/display.m \
-  classes/@Cork/get.m \
-  classes/@Cork/set.m
-
-class_Dork_FCN_FILES = \
-  classes/@Dork/Dork.m \
-  classes/@Dork/bling.m \
-  classes/@Dork/display.m \
-  classes/@Dork/gack.m \
-  classes/@Dork/get.m \
-  classes/@Dork/getStash.m \
-  classes/@Dork/private/myStash.m \
-  classes/@Dork/set.m
-
-class_Gork_FCN_FILES = \
-  classes/@Gork/Gork.m \
-  classes/@Gork/cork.m \
-  classes/@Gork/display.m \
-  classes/@Gork/gark.m \
-  classes/@Gork/get.m \
-  classes/@Gork/set.m \
-  classes/@Gork/subsasgn.m \
-  classes/@Gork/subsref.m
-
-class_Pork_FCN_FILES = \
-  classes/@Pork/Pork.m \
-  classes/@Pork/bling.m \
-  classes/@Pork/display.m \
-  classes/@Pork/get.m \
-  classes/@Pork/gurk.m \
-  classes/@Pork/private/myStash.m \
-  classes/@Pork/set.m
-
-class_Sneetch_FCN_FILES = \
-  classes/@Sneetch/Sneetch.m \
-  classes/@Sneetch/display.m
-
-class_Snork_FCN_FILES = \
-  classes/@Snork/Snork.m \
-  classes/@Snork/cack.m \
-  classes/@Snork/display.m \
-  classes/@Snork/double.m \
-  classes/@Snork/end.m \
-  classes/@Snork/eq.m \
-  classes/@Snork/ge.m \
-  classes/@Snork/get.m \
-  classes/@Snork/getStash.m \
-  classes/@Snork/gick.m \
-  classes/@Snork/gt.m \
-  classes/@Snork/horzcat.m \
-  classes/@Snork/ldivide.m \
-  classes/@Snork/le.m \
-  classes/@Snork/loadobj.m \
-  classes/@Snork/lt.m \
-  classes/@Snork/minus.m \
-  classes/@Snork/mldivide.m \
-  classes/@Snork/mpower.m \
-  classes/@Snork/mrdivide.m \
-  classes/@Snork/mtimes.m \
-  classes/@Snork/ne.m \
-  classes/@Snork/plus.m \
-  classes/@Snork/power.m \
-  classes/@Snork/private/myStash.m \
-  classes/@Snork/rdivide.m \
-  classes/@Snork/saveobj.m \
-  classes/@Snork/set.m \
-  classes/@Snork/subsasgn.m \
-  classes/@Snork/subsindex.m \
-  classes/@Snork/subsref.m \
-  classes/@Snork/tattack.m \
-  classes/@Snork/times.m \
-  classes/@Snork/uminus.m \
-  classes/@Snork/uplus.m \
-  classes/@Snork/vertcat.m
-
-class_Spork_FCN_FILES = \
-  classes/@Spork/Spork.m \
-  classes/@Spork/cack.m \
-  classes/@Spork/display.m \
-  classes/@Spork/geek.m \
-  classes/@Spork/get.m \
-  classes/@Spork/getStash.m \
-  classes/@Spork/loadobj.m \
-  classes/@Spork/private/myStash.m \
-  classes/@Spork/saveobj.m \
-  classes/@Spork/set.m
-
-class_CPrecedenceTester1_FCN_FILES = \
-  classes/@CPrecedenceTester1/CPrecedenceTester1.m \
-  classes/@CPrecedenceTester1/tattack.m
-
-class_CPrecedenceTester2_FCN_FILES = \
-  classes/@CPrecedenceTester2/CPrecedenceTester2.m \
-  classes/@CPrecedenceTester2/tattack.m
-
-class_CPrecedenceTester3_FCN_FILES = \
-  classes/@CPrecedenceTester3/CPrecedenceTester3.m \
-  classes/@CPrecedenceTester3/tattack.m
-
-classes_FCN_FILES = \
-  $(class_Blork_FCN_FILES) \
-  $(class_Cork_FCN_FILES) \
-  $(class_Dork_FCN_FILES) \
-  $(class_Gork_FCN_FILES) \
-  $(class_Pork_FCN_FILES) \
-  $(class_Sneetch_FCN_FILES) \
-  $(class_Snork_FCN_FILES) \
-  $(class_Spork_FCN_FILES) \
-  $(class_CPrecedenceTester1_FCN_FILES) \
-  $(class_CPrecedenceTester2_FCN_FILES) \
-  $(class_CPrecedenceTester3_FCN_FILES) \
-  classes/classes.tst
-
-FCN_FILES += $(classes_FCN_FILES)
--- a/test/ctor-vs-method/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-ctor_vs_method_FCN_FILES = \
-  ctor-vs-method/@derived/derived.m \
-  ctor-vs-method/@derived/parent.m \
-  ctor-vs-method/@other/other.m \
-  ctor-vs-method/@other/parent.m \
-  ctor-vs-method/@parent/method.m \
-  ctor-vs-method/@parent/parent.m \
-  ctor-vs-method/__trace__.m \
-  ctor-vs-method/ctor-vs-method.tst
-
-FCN_FILES += $(ctor_vs_method_FCN_FILES)
--- a/test/fcn-handle-derived-resolution/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-fcn_handle_derived_resolution_FCN_FILES = \
-  fcn-handle-derived-resolution/@fhdr_derived/fhdr_derived.m \
-  fcn-handle-derived-resolution/@fhdr_other/getsize_arrayfun.m \
-  fcn-handle-derived-resolution/@fhdr_other/getsize_cellfun.m \
-  fcn-handle-derived-resolution/@fhdr_other/getsize_loop.m \
-  fcn-handle-derived-resolution/@fhdr_other/fhdr_other.m \
-  fcn-handle-derived-resolution/@fhdr_parent/numel.m \
-  fcn-handle-derived-resolution/@fhdr_parent/fhdr_parent.m \
-  fcn-handle-derived-resolution/fcn-handle-derived-resolution.tst
-
-FCN_FILES += $(fcn_handle_derived_resolution_FCN_FILES)
--- a/test/nest/module.mk	Fri Jul 03 19:33:19 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-nest_fcn_files = \
-  nest/arg_nest.m \
-  nest/arg_ret.m \
-  nest/nest_eval.m \
-  nest/no_closure.m \
-  nest/persistent_nest.m \
-  nest/recursive_nest.m \
-  nest/recursive_nest2.m \
-  nest/recursive_nest3.m \
-  nest/scope0.m \
-  nest/scope1.m \
-  nest/scope2.m \
-  nest/scope3.m \
-  nest/script_nest.m \
-  nest/script_nest_script.m \
-  nest/nest.tst \
-  nest/varg_nest.m \
-  nest/varg_nest2.m
-
-FCN_FILES += $(nest_FCN_FILES)
-