gdl/gdl-build.patch
Orion Poplawski 55cf87b56a Update to current cvs
Add patch for testsuite make check to work in build directory
Add patch to fix pythongdl.c compile
Run the testsuite properly with make check
2012-05-15 15:48:51 -06:00

28 lines
1.3 KiB
Diff

diff -up gdl-0.9.2/testsuite/Makefile.am.build gdl-0.9.2/testsuite/Makefile.am
--- gdl-0.9.2/testsuite/Makefile.am.build 2012-05-10 15:11:37.730137963 -0600
+++ gdl-0.9.2/testsuite/Makefile.am 2012-05-10 16:15:25.312948418 -0600
@@ -2,7 +2,7 @@ check_LTLIBRARIES = libtest_ce.la
libtest_ce_la_SOURCES = libtest_ce.cpp
libtest_ce_la_LDFLAGS = -rpath $(abs_srcdir)/testsuite/.libs
-TESTS_ENVIRONMENT = $(top_srcdir)/testsuite/try $(top_srcdir)
+TESTS_ENVIRONMENT = $(top_srcdir)/testsuite/try $(top_srcdir) $(top_builddir)
TESTS = \
test_angles.pro \
test_base64.pro \
diff -up gdl-0.9.2/testsuite/try.build gdl-0.9.2/testsuite/try
--- gdl-0.9.2/testsuite/try.build 2011-05-02 05:00:47.000000000 -0600
+++ gdl-0.9.2/testsuite/try 2012-05-10 16:16:14.218180027 -0600
@@ -13,8 +13,8 @@
# - the procedure should not need any arguments/keywords
# a quick & dirty way of making the "checks" script work
-test "x$2" = "x./checks" && exit
+test "x$3" = "x./checks" && exit
echo "exit,status=1" | \
- IDL_PATH="" IDL_STARTUP="" GDL_STARTUP="" GDL_PATH=+$1/src/pro:$1/testsuite \
- $1/src/gdl -quiet -e `echo $2 | cut -d/ -f2 | cut -d. -f1` &> /dev/null
+ IDL_PATH="" IDL_STARTUP="" GDL_STARTUP="" GDL_PATH=+$2/src/pro:$1/testsuite \
+ $2/src/gdl -quiet -e `echo $2 | cut -d/ -f2 | cut -d. -f1` &> /dev/null