diff options
| author | David Thompson <dthompson2@worcester.edu> | 2021-10-06 17:11:01 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2021-10-06 17:11:01 -0400 |
| commit | 15d838868b6dd7993d3f04c0a22bd9addaf731af (patch) | |
| tree | f06bcbcfaa35eea0bda1a026c5d1e51bcfdb4baa | |
| parent | 03cb76faf452dcf30fe86d6522c1de88ba2fa923 (diff) | |
Collapse test hierarchy into a single directory.
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | tests/array-list.scm (renamed from tests/data/array-list.scm) | 2 | ||||
| -rw-r--r-- | tests/heap.scm (renamed from tests/data/heap.scm) | 2 | ||||
| -rw-r--r-- | tests/quadtree.scm (renamed from tests/data/quadtree.scm) | 2 | ||||
| -rw-r--r-- | tests/queue.scm (renamed from tests/data/queue.scm) | 2 | ||||
| -rw-r--r-- | tests/vector.scm (renamed from tests/math/vector.scm) | 2 |
6 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 45ef197..b5e77f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,11 +100,11 @@ SOURCES = \ chickadee/cli/bundle.scm TESTS = \ - tests/math/vector.scm \ - tests/data/array-list.scm \ - tests/data/heap.scm \ - tests/data/quadtree.scm \ - tests/data/queue.scm + tests/vector.scm \ + tests/array-list.scm \ + tests/heap.scm \ + tests/quadtree.scm \ + tests/queue.scm TEST_EXTENSIONS = .scm SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE) @@ -143,7 +143,11 @@ EXTRA_DIST += \ examples/models/Suzanne/Suzanne.gltf \ examples/models/Suzanne/Suzanne_BaseColor.png \ examples/models/Suzanne/Suzanne_MetallicRoughness.png \ - tests/utils.scm + tests/utils.scm \ + $(TESTS) + +CLEANFILES += \ + $(TESTS:tests/%.scm=%.log) dist_pkgdata_DATA = \ data/AUTHORS \ diff --git a/tests/data/array-list.scm b/tests/array-list.scm index f93b6fa..3907b02 100644 --- a/tests/data/array-list.scm +++ b/tests/array-list.scm @@ -15,7 +15,7 @@ ;;; along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (tests data array-list) +(define-module (tests array-list) #:use-module (tests utils) #:use-module (srfi srfi-64) #:use-module (chickadee data array-list)) diff --git a/tests/data/heap.scm b/tests/heap.scm index 351d20c..9c87384 100644 --- a/tests/data/heap.scm +++ b/tests/heap.scm @@ -15,7 +15,7 @@ ;;; along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (tests data heap) +(define-module (tests heap) #:use-module (tests utils) #:use-module (srfi srfi-64) #:use-module (chickadee data heap)) diff --git a/tests/data/quadtree.scm b/tests/quadtree.scm index 1dd37cc..fa578cd 100644 --- a/tests/data/quadtree.scm +++ b/tests/quadtree.scm @@ -15,7 +15,7 @@ ;;; along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (tests data quadtree) +(define-module (tests quadtree) #:use-module (tests utils) #:use-module (srfi srfi-64) #:use-module (chickadee data quadtree) diff --git a/tests/data/queue.scm b/tests/queue.scm index 0ccc808..03eaa01 100644 --- a/tests/data/queue.scm +++ b/tests/queue.scm @@ -15,7 +15,7 @@ ;;; along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (tests data queue) +(define-module (tests queue) #:use-module (tests utils) #:use-module (srfi srfi-64) #:use-module (chickadee data queue)) diff --git a/tests/math/vector.scm b/tests/vector.scm index c3fc900..aba5fd1 100644 --- a/tests/math/vector.scm +++ b/tests/vector.scm @@ -15,7 +15,7 @@ ;;; along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (tests math vector) +(define-module (tests vector) #:use-module (tests utils) #:use-module (srfi srfi-64) #:use-module (chickadee math) |