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

Neaten up test-suite Makefile regeneration

Browse source
This commit is contained in:
William S Fulton 2014-05-15 22:04:54 +01:00
commit 8ece62b945
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,11 +74,8 @@ SRCDIR = $(srcdir)/
SCRIPTDIR = $(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))
TEST_SUITE_SUBDIR = $(LANGUAGE)
endif
Makefile: $(srcdir)/Makefile.in ../../../config.status Makefile: $(srcdir)/Makefile.in ../../../config.status
cd ../../../ && $(SHELL) ./config.status $(EXAMPLES)/$(TEST_SUITE)/$(TEST_SUITE_SUBDIR)/Makefile cd ../../../ && $(SHELL) ./config.status $(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE)/Makefile
# #
# Please keep test cases in alphabetical order. # Please keep test cases in alphabetical order.

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

@ -13,7 +13,7 @@
# file (.stderr) in addition to the test case itself. # file (.stderr) in addition to the test case itself.
####################################################################### #######################################################################
LANGUAGE = python LANGUAGE = errors
ERROR_EXT = newerr ERROR_EXT = newerr
# Portable dos2unix / todos for stripping CR # Portable dos2unix / todos for stripping CR
TODOS = tr -d '\r' TODOS = tr -d '\r'
@ -35,9 +35,6 @@ C_ERROR_TEST_CASES := $(filter-out $(CPP_ERROR_TEST_CASES), $(ALL_ERROR_TEST_CAS
ERROR_TEST_CASES := $(CPP_ERROR_TEST_CASES:=.cpptest) \ ERROR_TEST_CASES := $(CPP_ERROR_TEST_CASES:=.cpptest) \
$(C_ERROR_TEST_CASES:=.ctest) $(C_ERROR_TEST_CASES:=.ctest)
# For rebuilding Makefile from Makefile.in in common.mk
TEST_SUITE_SUBDIR = errors
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
@ -56,5 +53,5 @@ include $(srcdir)/../common.mk
@exit 0 @exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile $(LANGUAGE)_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile python_clean
@rm -f *.$(ERROR_EXT) *.py @rm -f *.$(ERROR_EXT) *.py