Skip to content

Commit 8c21204

Browse files
committed
Makefile.am: fix make distcheck
The testsuite directory wasn't being created in the build tree which caused the output file not to be created causing all the tests to fail. The fix was to move the test files into the top level directory. If it grows too big, in the future I may split things out again, but with autoconf/automake, it seems to be more trouble than it is worth.
1 parent 5e6a8c9 commit 8c21204

14 files changed

Lines changed: 18 additions & 18 deletions

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tcb
2525
tcb*.tar.gz
2626
test-driver
2727
test-suite.log
28-
testsuite/*.out
29-
testsuite/*.log
30-
testsuite/*.trs
28+
*.out
29+
*.log
30+
*.trs
3131
ylwrap

Makefile.am

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,30 @@ tcb_LDADD = @LEXLIB@
5252
man_MANS = tcb.1
5353

5454
TESTS = \
55-
./testsuite/abs.sh \
56-
./testsuite/fib.sh \
57-
./testsuite/hello.sh \
58-
./testsuite/remainder.sh
55+
abs.sh \
56+
fib.sh \
57+
hello.sh \
58+
remainder.sh
5959

6060
TESTS_ENVIRONMENT = \
6161
DIFF=$(DIFF) \
6262
SED=$(SED) \
6363
TCB=$(top_builddir)/tcb \
6464
TOP_SRCDIR=$(top_srcdir) \
65-
TCB_IN_DIR=$(top_srcdir)/testsuite \
66-
TCB_OUT_DIR=$(top_builddir)/testsuite \
67-
TCB_EX_DIR=$(top_srcdir)/testsuite \
65+
TCB_IN_DIR=$(top_srcdir) \
66+
TCB_OUT_DIR=$(top_builddir) \
67+
TCB_EX_DIR=$(top_srcdir) \
6868
TEST_RUNNER=$(top_srcdir)/test-runner.sh
6969

7070
CLEANFILES = $(BUILT_SOURCES) \
71-
$(top_builddir)/testsuite/abs.out \
72-
$(top_builddir)/testsuite/fib.out \
73-
$(top_builddir)/testsuite/hello.out \
74-
$(top_builddir)/testsuite/remainder.out
71+
abs.out \
72+
fib.out \
73+
hello.out \
74+
remainder.out
7575

7676
EXTRA_DIST = $(man_MANS) $(top_srcdir)/test-runner.sh \
77-
$(top_srcdir)/testsuite/abs.sh $(top_srcdir)/testsuite/abs.bas $(top_srcdir)/testsuite/abs.ex \
78-
$(top_srcdir)/testsuite/fib.sh $(top_srcdir)/testsuite/fib.bas $(top_srcdir)/testsuite/fib.ex \
79-
$(top_srcdir)/testsuite/hello.sh $(top_srcdir)/testsuite/hello.bas $(top_srcdir)/testsuite/hello.ex \
80-
$(top_srcdir)/testsuite/remainder.sh $(top_srcdir)/testsuite/remainder.bas $(top_srcdir)/testsuite/remainder.ex
77+
abs.sh abs.bas abs.ex \
78+
fib.sh fib.bas fib.ex \
79+
hello.sh hello.bas hello.ex \
80+
remainder.sh remainder.bas remainder.ex
8181

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)