From 13aac0dca93188a70076c64269741516f7f75816 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 15 Mar 2014 18:23:02 +0000 Subject: Portability fixes for errors test-suite --- Examples/test-suite/errors/Makefile.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Examples/test-suite/errors/Makefile.in b/Examples/test-suite/errors/Makefile.in index fe6aff534..f8627ef1a 100644 --- a/Examples/test-suite/errors/Makefile.in +++ b/Examples/test-suite/errors/Makefile.in @@ -15,6 +15,8 @@ LANGUAGE = python ERROR_EXT = newerr +# Portable dos2unix / todos for stripping CR +TODOS = sed -e 's/\r$$//' srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -34,18 +36,18 @@ include $(srcdir)/../common.mk # Rules for the different types of tests %.cpptest: echo "$(ACTION)ing errors testcase $*" - -$(SWIG) -c++ -python -Wall $(SWIGOPT) $*.i 2> $*.$(ERROR_EXT) - $(COMPILETOOL) diff -c $*.stderr $*.newerr + -$(SWIG) -c++ -python -Wall -Fstandard $(SWIGOPT) $*.i 2>&1 | $(TODOS) > $*.$(ERROR_EXT) + $(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT) %.ctest: echo "$(ACTION)ing errors testcase $*" - -$(SWIG) -python -Wall $(SWIGOPT) $*.i 2> $*.$(ERROR_EXT) - $(COMPILETOOL) diff -c $*.stderr $*.newerr + -$(SWIG) -python -Wall -Fstandard $(SWIGOPT) $*.i 2>&1 | $(TODOS) > $*.$(ERROR_EXT) + $(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT) %.clean: clean: $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile $(LANGUAGE)_clean - @rm -f *.newerr *.py + @rm -f *.$(ERROR_EXT) *.py -- cgit v1.2.1