summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blossom2010-11-07 16:02:24 -0800
committerEric Blossom2010-11-10 12:17:57 -0800
commitf4959dce1e5ec6b61c10df489c2421d56963beb3 (patch)
treefcfe5bdf90def5ca7b15bde5b6d0cab32d33601e
parent8a4a74414804f1ccc1ce748b14f82acff3078806 (diff)
downloadgnuradio-f4959dce1e5ec6b61c10df489c2421d56963beb3.tar.gz
gnuradio-f4959dce1e5ec6b61c10df489c2421d56963beb3.tar.bz2
gnuradio-f4959dce1e5ec6b61c10df489c2421d56963beb3.zip
guile-test -> guile-test.in so we can use @GUILE@
-rw-r--r--config/grc_gnuradio_core.m42
-rw-r--r--gnuradio-core/src/guile/.gitignore1
-rw-r--r--gnuradio-core/src/guile/Makefile.am4
-rwxr-xr-xgnuradio-core/src/guile/gnuradio/test-suite/guile-test.in (renamed from gnuradio-core/src/guile/gnuradio/test-suite/guile-test)2
4 files changed, 7 insertions, 2 deletions
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index 8cbba49ef..5095f18f7 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -83,6 +83,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
gnuradio-core/src/gen_interpolator_taps/Makefile \
gnuradio-core/src/guile/Makefile \
gnuradio-core/src/guile/run_guile_tests \
+ gnuradio-core/src/guile/gnuradio/test-suite/guile-test \
gnuradio-core/src/lib/Makefile \
gnuradio-core/src/lib/filter/Makefile \
gnuradio-core/src/lib/g72x/Makefile \
@@ -116,6 +117,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
[
chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests
chmod +x gnuradio-core/src/guile/run_guile_tests
+ chmod +x gnuradio-core/src/guile/gnuradio/test-suite
])
])
])
diff --git a/gnuradio-core/src/guile/.gitignore b/gnuradio-core/src/guile/.gitignore
index 82a29a907..bc212f566 100644
--- a/gnuradio-core/src/guile/.gitignore
+++ b/gnuradio-core/src/guile/.gitignore
@@ -2,3 +2,4 @@
/Makefile.in
/run_guile_tests
/guile.log
+/gnuradio/test-suite/guile-test
diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am
index 71ce29067..d7fdbce60 100644
--- a/gnuradio-core/src/guile/Makefile.am
+++ b/gnuradio-core/src/guile/Makefile.am
@@ -22,7 +22,9 @@ include $(top_srcdir)/Makefile.common
TESTS = run_guile_tests
EXTRA_DIST = \
- run_guile_tests.in
+ run_guile_tests.in \
+ gnuradio/test-suite/guile-test.in
+
# These are the hand-code guile files for gnuradio-core.
#
diff --git a/gnuradio-core/src/guile/gnuradio/test-suite/guile-test b/gnuradio-core/src/guile/gnuradio/test-suite/guile-test.in
index 6dc1a9658..4d82f7592 100755
--- a/gnuradio-core/src/guile/gnuradio/test-suite/guile-test
+++ b/gnuradio-core/src/guile/gnuradio/test-suite/guile-test.in
@@ -1,4 +1,4 @@
-#!/usr/bin/guile \
+#!@GUILE@ \
-e main -s
!#