From d18e50a569a8a558218e035d71e07acb5082fcb2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Oct 2016 17:34:51 +0200 Subject: [PATCH] make tests standalone executable. * tests/closure.test: Add shebang and boot-0 include. * tests/let-syntax.test: Likewise. * tests/let.test: Likewise. * tests/match.test: Likewise. * tests/quasiquote.test: Likewise. * tests/record.test: Likewise. * tests/scm.test: Likewise. * GNUmakefile (mes-check): Run tests by exec'ing. --- GNUmakefile | 6 ++---- tests/base.test | 8 ++++++++ tests/closure.test | 8 ++++++++ tests/let-syntax.test | 8 ++++++++ tests/let.test | 8 ++++++++ tests/match.test | 8 ++++++++ tests/quasiquote.test | 8 ++++++++ tests/record.test | 9 +++++++++ tests/scm.test | 12 +++++++++--- 9 files changed, 68 insertions(+), 7 deletions(-) mode change 100644 => 100755 tests/base.test mode change 100644 => 100755 tests/closure.test mode change 100644 => 100755 tests/let-syntax.test mode change 100644 => 100755 tests/let.test mode change 100644 => 100755 tests/match.test mode change 100644 => 100755 tests/quasiquote.test mode change 100644 => 100755 tests/record.test mode change 100644 => 100755 tests/scm.test diff --git a/GNUmakefile b/GNUmakefile index 7cf9837d..64934108 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -69,13 +69,11 @@ MES-0:=guile/mes-0.scm MES:=./mes mes-check: all - for i in $(TESTS); do\ - cat $(BASE-0) $$(scripts/include.mes $$i) $$i | $(MES);\ - done + for i in $(TESTS); do ./$$i; done guile-check: for i in $(TESTS); do\ - guile -s <(cat $(MES-0) $$(scripts/include.mes $$i | grep -Ev 'let.mes|quasiquote.mes|srfi-0') $$i);\ + guile -s <(cat $(MES-0) $$(scripts/include.mes $$i | grep -Ev 'let.mes|quasiquote.mes|base-0|srfi-0') $$i);\ done for i in $(TESTS); do\ guile -s <(cat $(MES-0) module/mes/test.mes $$i);\ diff --git a/tests/base.test b/tests/base.test old mode 100644 new mode 100755 index 13a4716a..b6abe22c --- a/tests/base.test +++ b/tests/base.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes test)) diff --git a/tests/closure.test b/tests/closure.test old mode 100644 new mode 100755 index 096de29e..1c5d76eb --- a/tests/closure.test +++ b/tests/closure.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes test)) diff --git a/tests/let-syntax.test b/tests/let-syntax.test old mode 100644 new mode 100755 index 4fd0c979..95eec9bc --- a/tests/let-syntax.test +++ b/tests/let-syntax.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes quasiquote)) (mes-use-module (mes let)) diff --git a/tests/let.test b/tests/let.test old mode 100644 new mode 100755 index 7c9e987a..7f3f6b20 --- a/tests/let.test +++ b/tests/let.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes quasiquote)) (mes-use-module (mes let)) diff --git a/tests/match.test b/tests/match.test old mode 100644 new mode 100755 index 028c9f05..7b12a5cb --- a/tests/match.test +++ b/tests/match.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes quasiquote)) (mes-use-module (mes let)) diff --git a/tests/quasiquote.test b/tests/quasiquote.test old mode 100644 new mode 100755 index 72db3763..756452bf --- a/tests/quasiquote.test +++ b/tests/quasiquote.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes quasiquote)) (mes-use-module (mes test)) diff --git a/tests/record.test b/tests/record.test old mode 100644 new mode 100755 index 7b088c17..060aab52 --- a/tests/record.test +++ b/tests/record.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes quasiquote)) (mes-use-module (mes let)) @@ -27,6 +35,7 @@ (mes-use-module (mes record-0)) (mes-use-module (mes record)) (mes-use-module (srfi srfi-9)) + (mes-use-module (mes test)) (when guile? diff --git a/tests/scm.test b/tests/scm.test old mode 100644 new mode 100755 index bd5abf51..79515720 --- a/tests/scm.test +++ b/tests/scm.test @@ -1,3 +1,10 @@ +#! /bin/sh +# -*-scheme-*- +echo ' ()' | cat $($(dirname $0)/../scripts/include.mes $0) $0 /dev/stdin | $(dirname $0)/../scripts/mes "$@" +#paredit:|| +exit $? +!# + ;;; -*-scheme-*- ;;; Mes --- Maxwell Equations of Software @@ -18,6 +25,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Mes. If not, see . +(mes-use-module (mes base-0)) (mes-use-module (mes base)) (mes-use-module (mes quasiquote)) (mes-use-module (mes let)) @@ -26,9 +34,7 @@ (mes-use-module (mes test)) (when guile? - (module-define! (current-module) 'builtin? (lambda (. x) #t)) - (use-modules (srfi srfi-1)) - ) + (use-modules (srfi srfi-1))) (pass-if "first dummy" #t) (pass-if-not "second dummy" #f)