Permalink
Browse files

Removed remaining test files.

  • Loading branch information...
1 parent 1cb7fbd commit 068af38a3a6fc589ea98430c8c89081a4776e712 @csete committed Apr 9, 2011
Showing with 1 addition and 295 deletions.
  1. +1 −9 configure.ac
  2. +0 −140 setup_guile_test_env.in
  3. +0 −9 swig/Makefile.am
  4. +0 −54 swig/fcd.test
  5. +0 −69 swig/howto.test
  6. +0 −14 swig/run_guile_tests.in
View
@@ -40,7 +40,7 @@ _AM_SET_OPTION([tar-ustar])
AM_INIT_AUTOMAKE(gr-fcd,$RELEASE)
dnl This is kind of non-standard, but it sure shortens up this file :-)
-dnl FIXME: Include gnuradio-audio in GR_ASTANDALONE
+dnl FIXME: Include gnuradio-audio in GR_STANDALONE
m4_include([config/gr_standalone.m4])
GR_STANDALONE
@@ -79,22 +79,14 @@ dnl AX_BOOST_WSERIALIZATION
AC_CONFIG_FILES([\
Makefile \
- setup_guile_test_env \
apps/Makefile \
config/Makefile \
grc/Makefile \
lib/Makefile \
python/Makefile \
swig/Makefile \
- swig/run_guile_tests \
])
-dnl run_tests is created from run_tests.in. Make it executable.
-AC_CONFIG_COMMANDS([run_tests],
- [
- chmod +x swig/run_guile_tests
- ])
-
AC_OUTPUT
echo Configured gr-fcd release $RELEASE for build.
View
@@ -1,140 +0,0 @@
-#
-# Copyright 2010 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This is sourced by run_guile_tests to establish the environment
-# variables required to run the tests in the build tree.
-
-# add_local_paths is the only "public" function in this file
-
-# 1st argument is absolute path to hand coded guile source directory
-# 2nd argument is absolute path to component C++ shared library build directory
-# 3nd argument is absolute path to component SWIG build directory
-
-add_local_paths() {
- if [ $# -ne 3 ]
- then
- echo "$0: requires 3 args" 1>&2
- exit 1
- fi
-
- # Add local dirs to the front
- prepend_to_guile_load_path "$1"
- prepend_to_libpath "$2/.libs"
- [ "$2" != "$3" ] && prepend_to_libpath "$3/.libs"
- prepend_to_guile_load_path "$3"
-}
-
-# ------------------------------------------------------------------------
-
-abs_top_srcdir=@abs_top_srcdir@
-abs_top_builddir=@abs_top_builddir@
-
-# usage: prepend <path-varname> <dir>
-prepend() {
- if [ $# -ne 2 ]
- then
- echo "$0: prepend needs 2 args" 1>&2
- exit 1
- fi
- local path="$1" dir="$2" contents=""
- eval "contents=\$$path"
- if [ "$dir" != "" ]
- then
- if [ "$contents" = "" ]
- then
- eval "$path=\"$dir\""
- else
- eval "$path=\"$dir:$contents\""
- fi
- fi
- #echo end-of-prepend: $path=${!path}
-}
-
-# usage: append <path-varname> <dir>
-append() {
- if [ $# -ne 2 ]
- then
- echo "$0: append needs 2 args" 1>&2
- exit 1
- fi
- local path="$1" dir="$2" contents=""
- eval "contents=\$$path"
- if [ "$dir" != "" ]
- then
- if [ "$contents" = "" ]
- then
- eval "$path=\"$dir\""
- else
- eval "$path=\"$contents:$dir\""
- fi
- fi
- #echo end-of-append: $path=${!path}
-}
-
-prepend_to_guile_load_path() {
- prepend GUILE_LOAD_PATH "$1"
- export GUILE_LOAD_PATH
-}
-
-append_to_guile_load_path() {
- append GUILE_LOAD_PATH "$1"
- export GUILE_LOAD_PATH
-}
-
-prepend_to_libpath() {
- prepend LTDL_LIBRARY_PATH "$1"
- export LTDL_LIBRARY_PATH
- case "@host_os@" in
- darwin*)
- prepend DYLD_LIBRARY_PATH "$1"
- export DYLD_LIBRARY_PATH
- ;;
- cygwin*|win*|mingw*)
- prepend PATH "$1"
- export PATH
- ;;
- esac
-}
-
-append_to_libpath() {
- append LTDL_LIBRARY_PATH "$1"
- export LTDL_LIBRARY_PATH
- case "@host_os@" in
- darwin*)
- append DYLD_LIBRARY_PATH "$1"
- export DYLD_LIBRARY_PATH
- ;;
- cygwin*|win*|mingw*)
- append PATH "$1"
- export PATH
- ;;
- esac
-}
-
-# ------------------------------------------------------------------------
-# Start with gnuradio_core_LIBDIRPATH and gnuradio_core_GUILE_LOAD_PATH
-# ------------------------------------------------------------------------
-
-# Where to search for gnuradio-core shared libraries
-prepend_to_libpath @gnuradio_core_LIBDIRPATH@
-
-# Where to seach for gnuradio-core guile code
-prepend_to_guile_load_path @gnuradio_core_GUILE_LOAD_PATH@
-
-export GUILE_WARN_DEPRECATED=no
View
@@ -22,7 +22,6 @@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.swig
-noinst_GUILE = fcd.test
AM_CPPFLAGS += -I$(top_srcdir)/lib
@@ -48,11 +47,3 @@ fcd_swiginclude_headers = \
EXTRA_DIST = $(fcd_swiginclude_headers)
-
-if GUILE
-TESTS = run_guile_tests
-nobase_guile_DATA = \
- gnuradio/fcd_swig.scm
-endif
-
-EXTRA_DIST += $(nobase_guile_DATA)
View
@@ -1,54 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Radio
-;;;
-;;; GNU Radio is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Radio is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;; (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(define-module (test-module)
- #:use-module (oop goops)
- #:use-module (gnuradio core)
- #:use-module (gnuradio test-suite lib)
- #:duplicates (merge-generics replace check))
-
-
-;; Use our module
-(use-modules (gnuradio fcd_swig))
-
-
-(define (vector-map f v)
- (list->vector (map f (vector->list v))))
-
-;; FIXME
-(with-test-prefix "square-ff"
- (let* ((src-data #(-3. 4. -5.5 2. 3.))
- (expected-result (vector-map (lambda (x) (* x x)) src-data))
- (tb (gr:top-block-swig "QA top block"))
- (src (gr:vector-source-f src-data #f))
- (op (gr:howto-square-ff))
- (dst (gr:vector-sink-f)))
-
- (gr:connect tb src op dst)
-
- (gr:run tb)
- (test-equal expected-result (gr:data dst))))
View
@@ -1,69 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Radio
-;;;
-;;; GNU Radio is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Radio is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;; (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(define-module (test-module)
- #:use-module (oop goops)
- #:use-module (gnuradio core)
- #:use-module (gnuradio test-suite lib)
- #:duplicates (merge-generics replace check))
-
-
-;; Use our module
-(use-modules (gnuradio howto_swig))
-
-
-(define (vector-map f v)
- (list->vector (map f (vector->list v))))
-
-
-(with-test-prefix "square-ff"
- (let* ((src-data #(-3. 4. -5.5 2. 3.))
- (expected-result (vector-map (lambda (x) (* x x)) src-data))
- (tb (gr:top-block-swig "QA top block"))
- (src (gr:vector-source-f src-data #f))
- (op (gr:howto-square-ff))
- (dst (gr:vector-sink-f)))
-
- (gr:connect tb src op dst)
-
- (gr:run tb)
- (test-equal expected-result (gr:data dst))))
-
-
-(with-test-prefix "square2-ff"
- (let* ((src-data #(-3. 4. -5.5 2. 3.))
- (expected-result (vector-map (lambda (x) (* x x)) src-data))
- (tb (gr:top-block-swig "QA top block"))
- (src (gr:vector-source-f src-data #f))
- (op (gr:howto-square2-ff))
- (dst (gr:vector-sink-f)))
-
- (gr:connect tb src op dst)
-
- (gr:run tb)
- (test-equal expected-result (gr:data dst))))
-
View
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. @top_builddir@/setup_guile_test_env
-
-# 1st argument is absolute path to hand coded guile source directory
-# 2nd argument is absolute path to component C++ shared library build directory
-# 3nd argument is absolute path to component SWIG build directory
-
-add_local_paths \
- @srcdir@ \
- @abs_builddir@ \
- @abs_builddir@
-
-@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@

0 comments on commit 068af38

Please sign in to comment.