summaryrefslogtreecommitdiff
path: root/debian/patches/0020-nousbtest.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0020-nousbtest.patch')
-rw-r--r--debian/patches/0020-nousbtest.patch24
1 files changed, 14 insertions, 10 deletions
diff --git a/debian/patches/0020-nousbtest.patch b/debian/patches/0020-nousbtest.patch
index bf7deec..593298f 100644
--- a/debian/patches/0020-nousbtest.patch
+++ b/debian/patches/0020-nousbtest.patch
@@ -2,18 +2,20 @@ Description:
Don't build the USB tests because they will fail on the autobuilders.
Author: Mark Buda <hermit@acm.org>
---- a/testsuite/sanei/Makefile.am
-+++ b/testsuite/sanei/Makefile.am
-@@ -15,7 +15,7 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
+Index: trunk/testsuite/sanei/Makefile.am
+===================================================================
+--- trunk.orig/testsuite/sanei/Makefile.am
++++ trunk/testsuite/sanei/Makefile.am
+@@ -12,7 +12,7 @@ EXTRA_DIST = data/boolean.conf data/empt
+
+ TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
-check_PROGRAMS = sanei_usb_test test_wire sanei_check_test sanei_config_test sanei_constrain_test
+check_PROGRAMS = test_wire sanei_check_test sanei_config_test sanei_constrain_test
TESTS = $(check_PROGRAMS)
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-@@ -30,9 +30,6 @@
+ AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS)
+@@ -27,9 +27,6 @@ sanei_config_test_LDADD = $(TEST_LDADD)
sanei_check_test_SOURCES = sanei_check_test.c
sanei_check_test_LDADD = $(TEST_LDADD)
@@ -23,9 +25,11 @@ Author: Mark Buda <hermit@acm.org>
test_wire_SOURCES = test_wire.c
test_wire_LDADD = $(TEST_LDADD)
---- a/testsuite/sanei/Makefile.in
-+++ b/testsuite/sanei/Makefile.in
-@@ -77,7 +77,7 @@
+Index: trunk/testsuite/sanei/Makefile.in
+===================================================================
+--- trunk.orig/testsuite/sanei/Makefile.in
++++ trunk/testsuite/sanei/Makefile.in
+@@ -77,7 +77,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@