Author: yamakenz
Date: Wed Sep 12 17:05:13 2007
New Revision: 4957
Modified:
sigscheme-trunk/test-c/Makefile.am
sigscheme-trunk/test-c/sscm-test.h
sigscheme-trunk/test-c/test-array2list.c
sigscheme-trunk/test/run-singletest.sh.in
Log:
* test/run-singletest.sh.in
- (SSCM): Add --system-load-path
* test-c/sscm-test.h
- (TST_MAIN): Add --system-load-path to argv
* test-c/Makefile.am
- (AM_CPPFLAGS): Add -DTST_SCM_SYSTEM_LOAD_PATH
* test-c/test-array2list.c
- (null_ary): Removed since unused
Modified: sigscheme-trunk/test-c/Makefile.am
==============================================================================
--- sigscheme-trunk/test-c/Makefile.am (original)
+++ sigscheme-trunk/test-c/Makefile.am Wed Sep 12 17:05:13 2007
@@ -2,7 +2,8 @@
# To take precedence over installed gcroots.h by the bundled
# libgcroots/include/gcroots.h, @GCROOTS_CFLAGS@ must be placed here.
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/src @GCROOTS_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/src @GCROOTS_CFLAGS@ \
+ -DTST_SCM_SYSTEM_LOAD_PATH=\"@abs_top_srcdir@/lib\"
AM_CFLAGS =
AM_LDFLAGS = -rpath $(libdir)
LIBS = $(top_builddir)/src/libsscm.la @GCROOTS_LIBS@
Modified: sigscheme-trunk/test-c/sscm-test.h
==============================================================================
--- sigscheme-trunk/test-c/sscm-test.h (original)
+++ sigscheme-trunk/test-c/sscm-test.h Wed Sep 12 17:05:13 2007
@@ -244,7 +244,12 @@
main(int argc, char *argv[]) \
{ \
tst_suite_info suite = TST_DEFAULT_SUITE_SETUP; \
- scm_initialize(NULL, NULL); \
+ const char *my_argv[] = { \
+ "dummy", \
+ "--system-load-path", TST_SCM_SYSTEM_LOAD_PATH, \
+ NULL \
+ }; \
+ scm_initialize(NULL, my_argv); \
tst_main(&suite); \
scm_finalize(); \
TST_DEFAULT_SUITE_CLEANUP(suite); \
Modified: sigscheme-trunk/test-c/test-array2list.c
==============================================================================
--- sigscheme-trunk/test-c/test-array2list.c (original)
+++ sigscheme-trunk/test-c/test-array2list.c Wed Sep 12 17:05:13 2007
@@ -45,11 +45,6 @@
NULL
};
-static char *null_ary[] = {
- NULL
-};
-
-
static ScmObj
make_str(void *str)
{
Modified: sigscheme-trunk/test/run-singletest.sh.in
==============================================================================
--- sigscheme-trunk/test/run-singletest.sh.in (original)
+++ sigscheme-trunk/test/run-singletest.sh.in Wed Sep 12 17:05:13 2007
@@ -1,6 +1,6 @@
#!/bin/sh
[EMAIL PROTECTED]@/src/sscm
+SSCM="@abs_top_builddir@/src/sscm --system-load-path @abs_top_srcdir@/lib"
[EMAIL PROTECTED]@/test
cd @top_srcdir@ && $SSCM $TESTS_DIR/$1
