components/guile/patches/fix-tests.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 07 Jan 2016 13:22:27 -0800
changeset 5243 cb29cf94919d
parent 3725 57a3df1e928a
permissions -rw-r--r--
PSARC 2015/152 serf - High-performance asynchronous HTTP client library 20780708 We should integrate serf into Solaris
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3725
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Fix the guile "libtest-asmobs" test based on the checkin at:
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
http://git.savannah.gnu.org/gitweb/?p=guile.git;a=commitdiff;h=5b98517a652ea51cbb0fd03e87a50c0b3add9707
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
--- guile-1.8.6/test-suite/standalone/Makefile.in.orig	2015-02-03 06:36:37.592289075 -0800
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
+++ guile-1.8.6/test-suite/standalone/Makefile.in	2015-02-03 06:37:38.135679120 -0800
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
@@ -372,7 +372,9 @@
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
 	test-bad-identifiers test-asmobs test-use-srfi
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
 BUILT_SOURCES = test-asmobs-lib.x
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
 EXTRA_DIST = $(am__append_3) ${check_SCRIPTS}
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
+TESTS_ENVIRONMENT = \
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
+  builddir="$(builddir)" \
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
+  "${top_builddir}/pre-inst-guile-env"
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
 test_cflags = \
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
   -I$(top_srcdir)/test-suite/standalone		\
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
   -I$(top_srcdir) -I$(top_builddir)		\
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
--- guile-1.8.6/test-suite/standalone/test-asmobs.orig	2015-02-03 06:42:27.703314819 -0800
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
+++ guile-1.8.6/test-suite/standalone/test-asmobs	2015-02-03 06:38:10.485164432 -0800
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
@@ -2,7 +2,8 @@
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
 exec guile -q -s "$0" "$@"
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
 !#
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
-(load-extension "libtest-asmobs" "libtest_asmobs_init")
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
+(load-extension (string-append (getenv "builddir") "/libtest-asmobs")
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
+                "libtest_asmobs_init")
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
 
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
 (define (test x v)
57a3df1e928a 20460414 GUILE should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
   (if v