From b0e6f144423689ab8baa9c5e74af8ee8eb908b74 Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Mon, 22 Jun 2015 11:07:56 +0900 Subject: [PATCH] Move r7rs-tests.scm into a nitro. Signed-off-by: OGINO Masanori --- Makefile | 5 +---- contrib/20.r7rs/nitro.mk | 7 +++++++ t/r7rs-tests.scm => contrib/20.r7rs/t/r7rs.scm | 0 3 files changed, 8 insertions(+), 4 deletions(-) rename t/r7rs-tests.scm => contrib/20.r7rs/t/r7rs.scm (100%) diff --git a/Makefile b/Makefile index 030a248e..ccc08d82 100644 --- a/Makefile +++ b/Makefile @@ -68,10 +68,7 @@ docs/contrib.rst: $(CONTRIB_DOCS) run: bin/picrin bin/picrin -test: test-r7rs test-contribs test-nostdlib - -test-r7rs: bin/picrin t/r7rs-tests.scm - bin/picrin t/r7rs-tests.scm +test: test-contribs test-nostdlib test-contribs: bin/picrin $(CONTRIB_TESTS) diff --git a/contrib/20.r7rs/nitro.mk b/contrib/20.r7rs/nitro.mk index eef49eac..9ddf756f 100644 --- a/contrib/20.r7rs/nitro.mk +++ b/contrib/20.r7rs/nitro.mk @@ -22,3 +22,10 @@ CONTRIB_LIBS += \ contrib/20.r7rs/scheme/process-context.scm\ contrib/20.r7rs/scheme/time.scm\ contrib/20.r7rs/scheme/r5rs.scm + +CONTRIB_TESTS += test-r7rs + +test-r7rs: bin/picrin + for test in `ls contrib/20.r7rs/t/*.scm`; do \ + bin/picrin "$$test"; \ + done diff --git a/t/r7rs-tests.scm b/contrib/20.r7rs/t/r7rs.scm similarity index 100% rename from t/r7rs-tests.scm rename to contrib/20.r7rs/t/r7rs.scm