diff options
| author | Eric Blossom | 2010-11-07 17:46:36 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-10 12:17:58 -0800 |
| commit | d1d804742ac2cfcc31240c6d74d764e5784831d4 (patch) | |
| tree | dd69c48a91fb9551f7c8c56988b2f37ee03c09ba /gnuradio-core/src | |
| parent | 72739e8fde9353e502edc937bd6f9f77f6b80cc6 (diff) | |
| download | gnuradio-d1d804742ac2cfcc31240c6d74d764e5784831d4.tar.gz gnuradio-d1d804742ac2cfcc31240c6d74d764e5784831d4.tar.bz2 gnuradio-d1d804742ac2cfcc31240c6d74d764e5784831d4.zip | |
Make check works again, now using guile's native test-suite code.
The srfi-64 code wouldn't pass it's own test code under guile...
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/guile/.gitignore | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gnuradio-core/src/guile/gnuradio/test-suite/guile-test (renamed from gnuradio-core/src/guile/gnuradio/test-suite/guile-test.in) | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/guile/run_guile_tests.in | 15 |
3 files changed, 10 insertions, 8 deletions
diff --git a/gnuradio-core/src/guile/.gitignore b/gnuradio-core/src/guile/.gitignore index bc212f566..82a29a907 100644 --- a/gnuradio-core/src/guile/.gitignore +++ b/gnuradio-core/src/guile/.gitignore @@ -2,4 +2,3 @@ /Makefile.in /run_guile_tests /guile.log -/gnuradio/test-suite/guile-test diff --git a/gnuradio-core/src/guile/gnuradio/test-suite/guile-test.in b/gnuradio-core/src/guile/gnuradio/test-suite/guile-test index 4d82f7592..6dc1a9658 100755..100644 --- a/gnuradio-core/src/guile/gnuradio/test-suite/guile-test.in +++ b/gnuradio-core/src/guile/gnuradio/test-suite/guile-test @@ -1,4 +1,4 @@ -#!@GUILE@ \ +#!/usr/bin/guile \ -e main -s !# diff --git a/gnuradio-core/src/guile/run_guile_tests.in b/gnuradio-core/src/guile/run_guile_tests.in index 2ef160397..e52497332 100644 --- a/gnuradio-core/src/guile/run_guile_tests.in +++ b/gnuradio-core/src/guile/run_guile_tests.in @@ -1,12 +1,15 @@ #!/bin/sh +. @top_builddir@/setup_guile_test_env + # 1st argument is absolute path to component C++ shared library build directory # 2nd argument is absolute path to hand coded guile source directory # 3nd argument is absolute path to component SWIG build directory -# 4rd argument is absolute path to component Guile QA test directory -@top_builddir@/run_guile_tests.sh \ - "" \ - "" \ - "" \ - @abs_top_srcdir@/gnuradio-core/src/guile +# We're in gnuradio-core, we don't need this +# add_local_paths \ +# "" \ +# "" \ +# "" + +@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t tests |