jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Slight simplification of test-suite build for new out-of-source changes

Browse source 
Provide default SRCDIR and SCRIPTDIR variables in common.mk and override
only where needed.
This commit is contained in:
William S Fulton 2014-05-13 23:30:00 +01:00
commit 2b5499a262
25 changed files with 9 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/Makefile.in
View file

@ -26,8 +26,8 @@ Makefile: @srcdir@/Makefile.in ../config.status
cd .. && $(SHELL) ./config.status Examples/Makefile cd .. && $(SHELL) ./config.status Examples/Makefile
# SRCDIR is the relative path to the current source directory # SRCDIR is the relative path to the current source directory
# - For in-source-tree builds, SRCDIR with be either '', # - For in-source-tree builds, SRCDIR with be either '' or './', but
# or '../' for some of the test suites (e.g. C#, Java) # '../' for the test suites that build in a subdir (e.g. C#, Java)
# - For out-of-source-tree builds, SRCDIR will be a relative # - For out-of-source-tree builds, SRCDIR will be a relative
# path ending with a '/' # path ending with a '/'

5
Examples/test-suite/allegrocl/Makefile.in
View file

@ -9,11 +9,6 @@ SCRIPTSUFFIX = _runme.lisp
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
# these cpp tests generate warnings/errors when compiling # these cpp tests generate warnings/errors when compiling

5
Examples/test-suite/cffi/Makefile.in
View file

@ -9,11 +9,6 @@ SCRIPTSUFFIX = _runme.lisp
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

5
Examples/test-suite/chicken/Makefile.in
View file

@ -10,11 +10,6 @@ PROXYSUFFIX = _runme_proxy.ss
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
CHICKEN_CSI = @CHICKEN_CSI@ -quiet -batch -no-init CHICKEN_CSI = @CHICKEN_CSI@ -quiet -batch -no-init
SO = @SO@ SO = @SO@

5
Examples/test-suite/clisp/Makefile.in
View file

@ -9,11 +9,6 @@ SCRIPTSUFFIX = _runme.lisp
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

2
Examples/test-suite/common.mk
View file

@ -70,6 +70,8 @@ LIBS = -L.
LIBPREFIX = lib LIBPREFIX = lib
ACTION = check ACTION = check
INTERFACEDIR = ../ INTERFACEDIR = ../
SRCDIR = $(srcdir)/
SCRIPTDIR = $(srcdir)
# Regenerate Makefile if Makefile.in or config.status have changed. # Regenerate Makefile if Makefile.in or config.status have changed.
ifeq (,$(TEST_SUITE_SUBDIR)) ifeq (,$(TEST_SUITE_SUBDIR))

7
Examples/test-suite/csharp/Makefile.in
View file

@ -3,7 +3,6 @@
####################################################################### #######################################################################
LANGUAGE = csharp LANGUAGE = csharp
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.cs SCRIPTSUFFIX = _runme.cs
CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@ CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
CSHARPCILINTERPRETER_FLAGS = @CSHARPCILINTERPRETER_FLAGS@ CSHARPCILINTERPRETER_FLAGS = @CSHARPCILINTERPRETER_FLAGS@
@ -13,11 +12,6 @@ CSHARPCYGPATH_W = @CSHARPCYGPATH_W@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = ../@top_srcdir@ top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@ top_builddir = ../@top_builddir@
ifeq (.,$(srcdir))
SRCDIR = ../
else
SRCDIR = ../$(srcdir)/
endif
CPP_TEST_CASES = \ CPP_TEST_CASES = \
csharp_attributes \ csharp_attributes \
@ -37,6 +31,7 @@ CPP_TEST_CASES = \
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
SRCDIR = ../$(srcdir)/
SWIGOPT += -namespace $*Namespace SWIGOPT += -namespace $*Namespace
CSHARPFLAGSSPECIAL = CSHARPFLAGSSPECIAL =

5
Examples/test-suite/d/Makefile.in
View file

@ -7,11 +7,6 @@ LANGUAGE = d
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
ifeq (2,$(D_VERSION)) ifeq (2,$(D_VERSION))
VERSIONSUFFIX = .2 VERSIONSUFFIX = .2

5
Examples/test-suite/errors/Makefile.in
View file

@ -22,11 +22,6 @@ TODOS = tr -d '\r'
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
# strip source directory from output, so that diffs compare # strip source directory from output, so that diffs compare
srcdir_regexp = $(shell echo $(srcdir)/ | sed 's/\./[.]/g') srcdir_regexp = $(shell echo $(srcdir)/ | sed 's/\./[.]/g')

6
Examples/test-suite/go/Makefile.in
View file

@ -9,7 +9,6 @@ GO1 = @GO1@
GO12 = @GO12@ GO12 = @GO12@
GO13 = @GO13@ GO13 = @GO13@
GOC = @GOC@ GOC = @GOC@
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.go SCRIPTSUFFIX = _runme.go
GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi`
@ -24,11 +23,6 @@ SO = @SO@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

6
Examples/test-suite/guile/Makefile.in
View file

@ -6,17 +6,11 @@ EXTRA_TEST_CASES += guile_ext_test.externaltest
LANGUAGE = guile LANGUAGE = guile
VARIANT = VARIANT =
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.scm SCRIPTSUFFIX = _runme.scm
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
GUILE = @GUILE@ GUILE = @GUILE@
GUILE_RUNTIME= GUILE_RUNTIME=

7
Examples/test-suite/java/Makefile.in
View file

@ -6,17 +6,11 @@ LANGUAGE = java
JAVA = @JAVA@ JAVA = @JAVA@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
JAVAFLAGS = -Xcheck:jni JAVAFLAGS = -Xcheck:jni
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.java SCRIPTSUFFIX = _runme.java
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = ../@top_srcdir@ top_srcdir = ../@top_srcdir@
top_builddir = ../@top_builddir@ top_builddir = ../@top_builddir@
ifeq (.,$(srcdir))
SRCDIR = ../
else
SRCDIR = ../$(srcdir)/
endif
C_TEST_CASES = \ C_TEST_CASES = \
java_lib_arrays \ java_lib_arrays \
@ -49,6 +43,7 @@ CPP_TEST_CASES = \
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
SRCDIR = ../$(srcdir)/
JAVA_PACKAGE = $* JAVA_PACKAGE = $*
JAVA_PACKAGEOPT = -package $(JAVA_PACKAGE) JAVA_PACKAGEOPT = -package $(JAVA_PACKAGE)
SWIGOPT += $(JAVA_PACKAGEOPT) SWIGOPT += $(JAVA_PACKAGEOPT)

5
Examples/test-suite/javascript/Makefile.in
View file

@ -10,11 +10,6 @@ SCRIPTSUFFIX = _runme.js
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
SWIG = $(top_builddir)/preinst_swig SWIG = $(top_builddir)/preinst_swig

6
Examples/test-suite/lua/Makefile.in
View file

@ -4,17 +4,11 @@
LANGUAGE = lua LANGUAGE = lua
LUA = @LUABIN@ LUA = @LUABIN@
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.lua SCRIPTSUFFIX = _runme.lua
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
# sorry, currently very few test cases work/have been written # sorry, currently very few test cases work/have been written

5
Examples/test-suite/mzscheme/Makefile.in
View file

@ -9,11 +9,6 @@ SCRIPTSUFFIX = _runme.scm
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

5
Examples/test-suite/ocaml/Makefile.in
View file

@ -10,11 +10,6 @@ SCRIPTSUFFIX = _runme.ml
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
C_TEST_CASES = C_TEST_CASES =

6
Examples/test-suite/octave/Makefile.in
View file

@ -4,17 +4,11 @@
LANGUAGE = octave LANGUAGE = octave
OCTAVE = @OCTAVE@ OCTAVE = @OCTAVE@
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.m SCRIPTSUFFIX = _runme.m
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
CPP_TEST_CASES += \ CPP_TEST_CASES += \
li_std_pair_extra \ li_std_pair_extra \

6
Examples/test-suite/perl5/Makefile.in
View file

@ -4,18 +4,12 @@
LANGUAGE = perl5 LANGUAGE = perl5
PERL = @PERL@ PERL = @PERL@
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.pl SCRIPTSUFFIX = _runme.pl
TEST_RUNNER = $(srcdir)/run-perl-test.pl TEST_RUNNER = $(srcdir)/run-perl-test.pl
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
CPP_TEST_CASES += \ CPP_TEST_CASES += \
primitive_types \ primitive_types \

6
Examples/test-suite/php/Makefile.in
View file

@ -3,17 +3,11 @@
####################################################################### #######################################################################
LANGUAGE = php LANGUAGE = php
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.php SCRIPTSUFFIX = _runme.php
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
CPP_TEST_CASES += \ CPP_TEST_CASES += \
php_namewarn_rename \ php_namewarn_rename \

5
Examples/test-suite/pike/Makefile.in
View file

@ -9,11 +9,6 @@ SCRIPTSUFFIX = _runme.pike
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

15
Examples/test-suite/python/Makefile.in
View file

@ -14,6 +14,7 @@ PYTHON = $(PYBIN)
#*_runme.py for Python 2.x, *_runme3.py for Python 3.x #*_runme.py for Python 2.x, *_runme3.py for Python 3.x
PY2SCRIPTSUFFIX = _runme.py PY2SCRIPTSUFFIX = _runme.py
PY3SCRIPTSUFFIX = _runme3.py PY3SCRIPTSUFFIX = _runme3.py
PY2TO3 = 2to3 -x import
ifeq (,$(PY3)) ifeq (,$(PY3))
SCRIPTSUFFIX = $(PY2SCRIPTSUFFIX) SCRIPTSUFFIX = $(PY2SCRIPTSUFFIX)
@ -21,20 +22,9 @@ else
SCRIPTSUFFIX = $(PY3SCRIPTSUFFIX) SCRIPTSUFFIX = $(PY3SCRIPTSUFFIX)
endif endif
SCRIPTDIR = .
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
PY2TO3 = 2to3 -x import
CPP_TEST_CASES += \ CPP_TEST_CASES += \
argcargvtest \ argcargvtest \
@ -109,7 +99,8 @@ BUILTIN_NOT_BROKEN = $(filter-out $(BUILTIN_BROKEN),$(NOT_BROKEN_TEST_CASES))
builtin-check : $(BUILTIN_NOT_BROKEN) builtin-check : $(BUILTIN_NOT_BROKEN)
# Overridden variables here # Overridden variables here
LIBS = -L. SCRIPTDIR = .
LIBS = -L.
VALGRIND_OPT += --suppressions=pythonswig.supp VALGRIND_OPT += --suppressions=pythonswig.supp
# Custom tests - tests with additional commandline options # Custom tests - tests with additional commandline options

5
Examples/test-suite/r/Makefile.in
View file

@ -10,11 +10,6 @@ RUNR = R CMD BATCH --no-save --no-restore
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
C_TEST_CASES += \ C_TEST_CASES += \
r_copy_struct \ r_copy_struct \

6
Examples/test-suite/ruby/Makefile.in
View file

@ -4,17 +4,11 @@
LANGUAGE = ruby LANGUAGE = ruby
RUBY = @RUBY@ RUBY = @RUBY@
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.rb SCRIPTSUFFIX = _runme.rb
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
CPP_TEST_CASES = \ CPP_TEST_CASES = \
kwargs_feature \ kwargs_feature \

6
Examples/test-suite/tcl/Makefile.in
View file

@ -4,17 +4,11 @@
LANGUAGE = tcl LANGUAGE = tcl
TCLSH = tclsh TCLSH = tclsh
SCRIPTDIR = $(srcdir)
SCRIPTSUFFIX = _runme.tcl SCRIPTSUFFIX = _runme.tcl
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
CPP_TEST_CASES += \ CPP_TEST_CASES += \
primitive_types \ primitive_types \

5
Examples/test-suite/uffi/Makefile.in
View file

@ -9,11 +9,6 @@ SCRIPTSUFFIX = _runme.lisp
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
ifeq (.,$(srcdir))
SRCDIR =
else
SRCDIR = $(srcdir)/
endif
include $(srcdir)/../common.mk include $(srcdir)/../common.mk