Reorganize tests
* tests/bash-without-bash.scm: Move this... * tests/bootstrap/bash-without-bash.scm: ...here. * tests/*.scm*: Move these... * tests/unit: ...into this directory. * configure.ac: Update paths. * Makefile.am: Ditto. * .gitignore: Ditto.
This commit is contained in:
parent
b67fdc6fbf
commit
110167674e
|
@ -14,8 +14,8 @@ coverage/*
|
|||
lcov.info
|
||||
pre-inst-env
|
||||
scripts/geesh
|
||||
tests/*.trs
|
||||
tests/config.scm
|
||||
tests/unit/*.trs
|
||||
tests/unit/config.scm
|
||||
tests/spec/oil
|
||||
tests/spec/oil-link
|
||||
tools/coverage
|
||||
|
|
20
Makefile.am
20
Makefile.am
|
@ -42,7 +42,7 @@ check-spec:
|
|||
|
||||
.PHONY: check-bootstrap
|
||||
check-bootstrap:
|
||||
guix build -f tests/bash-without-bash.scm
|
||||
guix build -f tests/bootstrap/bash-without-bash.scm
|
||||
|
||||
dist-hook:
|
||||
echo $(VERSION) > $(distdir)/.tarball-version
|
||||
|
@ -92,12 +92,14 @@ scripts/geesh: scripts/geesh.in Makefile
|
|||
$(do_subst) < $(srcdir)/scripts/geesh.in > scripts/geesh
|
||||
chmod a+x scripts/geesh
|
||||
|
||||
TESTS = \
|
||||
tests/lexer.scm \
|
||||
tests/parser.scm \
|
||||
tests/pattern.scm \
|
||||
tests/shell.scm \
|
||||
tests/word.scm
|
||||
UNIT_TESTS = \
|
||||
tests/unit/lexer.scm \
|
||||
tests/unit/parser.scm \
|
||||
tests/unit/pattern.scm \
|
||||
tests/unit/shell.scm \
|
||||
tests/unit/word.scm
|
||||
|
||||
TESTS = $(UNIT_TESTS)
|
||||
|
||||
EXTRA_DIST = \
|
||||
scripts/geesh.in
|
||||
|
@ -105,8 +107,8 @@ EXTRA_DIST = \
|
|||
CLEANFILES = \
|
||||
$(GOBJECTS) \
|
||||
$(bin_SCRIPTS) \
|
||||
$(TESTS:tests/%.scm=%.log) \
|
||||
$(TESTS:tests/%.scm=%.trs)
|
||||
$(TESTS:tests/unit/%.scm=%.log) \
|
||||
$(TESTS:tests/unit/%.scm=%.trs)
|
||||
|
||||
clean-local:
|
||||
$(MAKE) $(AM_MAKEFLAGS) -L -C tests/spec clean
|
||||
|
|
|
@ -13,7 +13,7 @@ AM_CONDITIONAL([HAVE_GENHTML], [test -n $GENHTML])
|
|||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
|
||||
AC_CONFIG_FILES([tests/config.scm])
|
||||
AC_CONFIG_FILES([tests/unit/config.scm])
|
||||
AC_CONFIG_FILES([tests/spec/Makefile])
|
||||
AC_CONFIG_FILES([tools/coverage], [chmod +x tools/coverage])
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
(ice-9 match))
|
||||
|
||||
(define geesh
|
||||
(load (string-append (current-source-directory) "/../guix.scm")))
|
||||
(load (string-append (current-source-directory) "/../../guix.scm")))
|
||||
|
||||
(define geesh-with-links
|
||||
(package
|
|
@ -16,7 +16,7 @@
|
|||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with Geesh. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (tests automake)
|
||||
(define-module (tests unit automake)
|
||||
#:use-module (srfi srfi-64))
|
||||
|
||||
;;; Commentary:
|
|
@ -1,4 +1,4 @@
|
|||
(define-module (tests config)
|
||||
(define-module (tests unit config)
|
||||
#:export (*guile-path*))
|
||||
|
||||
(define *guile-path* "@GUILE@")
|
|
@ -21,7 +21,7 @@
|
|||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (system base lalr)
|
||||
#:use-module (tests automake))
|
||||
#:use-module (tests unit automake))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
|
@ -19,7 +19,7 @@
|
|||
(define-module (test-parser)
|
||||
#:use-module (geesh parser)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (tests automake))
|
||||
#:use-module (tests unit automake))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
|
@ -19,7 +19,7 @@
|
|||
(define-module (test-pattern)
|
||||
#:use-module (geesh pattern)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (tests automake))
|
||||
#:use-module (tests unit automake))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
|
@ -23,8 +23,8 @@
|
|||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 textual-ports)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (tests automake)
|
||||
#:use-module (tests config))
|
||||
#:use-module (tests unit automake)
|
||||
#:use-module (tests unit config))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
|
@ -20,7 +20,7 @@
|
|||
#:use-module (geesh environment)
|
||||
#:use-module (geesh word)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (tests automake))
|
||||
#:use-module (tests unit automake))
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
Loading…
Reference in New Issue