Rearrange into other veriables, and include run-markup-tests.sh.

* tests/Makefile.am (TESTS): Rearrange into other veriables, and
include run-markup-tests.sh.
(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
(noinst_PROGRAMS): Rename to ...
(check_PROGRAMS): ... this.  'automake' ensures that these are
built before running the tests.
* tests/run-markup-tests.sh: Support $srcdir != $builddir.

tests/Makefile.am

@@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@
 
 EFENCE=
 
-EXTRA_DIST = 			\
+EXTRA_DIST = \
+	$(test_scripts)		\
 	makefile.msc.in		\
-	makefile.mingw.in	\
-	run-markup-tests.sh
+	makefile.mingw.in
 
 BUILT_EXTRA_DIST = \
 	makefile.msc	\
 	makefile.mingw
 
-TESTS = \
+test_programs = \
 	array-test	\
 	date-test	\
 	dirname-test	\
@@ -34,7 +34,14 @@ TESTS = \
 	tree-test	\
 	type-test
 
-noinst_PROGRAMS = $(TESTS) markup-test
+test_scripts = run-markup-tests.sh
+
+test_script_support_programs = markup-test
+
+check_PROGRAMS = $(test_programs) $(test_script_support_programs)
+
+TESTS = $(test_programs) $(test_scripts)
+TESTS_ENVIRONMENT = srcdir=$(srcdir)
 
 progs_LDADD = $(EFENCE) $(top_builddir)/libglib-1.3.la $(EFENCE)
 thread_LDADD = $(progs_LDADD) $(top_builddir)/gthread/libgthread-1.3.la @G_THREAD_LIBS@
@@ -75,4 +82,4 @@ dist-hook: $(BUILT_EXTRA_DIST)
 	mkdir $(distdir)/markups;          \
 	for f in $(srcdir)/markups/* ; do  \
 	  cp $$f $(distdir)/markups;       \
-        done
+	done

tests/run-markup-tests.sh

@@ -6,14 +6,14 @@ fail ()
   exit 1
 }
 
-for I in markups/fail-*.gmarkup; do
+for I in $srcdir/markups/fail-*.gmarkup; do
   echo "Parsing $I, should fail"
   ./markup-test $I > /dev/null && fail "failed to generate error on $I"
 done
 
-for I in markups/valid-*.gmarkup; do
+for I in $srcdir/markups/valid-*.gmarkup; do
   echo "Parsing $I, should succeed"
   ./markup-test $I > /dev/null || fail "failed on $I"
 done
 
-echo "All tests passed."
+echo "All tests passed."