# 
# 
# delete "tests/t_add.at"
# 
# delete "tests/t_add_dot.at"
# 
# delete "tests/t_add_drop_add.at"
# 
# delete "tests/t_add_edge.at"
# 
# delete "tests/t_add_patch_drop_add.at"
# 
# delete "tests/t_attributes.at"
# 
# delete "tests/t_chkeypass.at"
# 
# delete "tests/t_cleanup_empty_dir.at"
# 
# delete "tests/t_cross.at"
# 
# delete "tests/t_cvsimport.at"
# 
# delete "tests/t_cwork.at"
# 
# delete "tests/t_diff_added_file.at"
# 
# delete "tests/t_disapprove.at"
# 
# delete "tests/t_drop.at"
# 
# delete "tests/t_drop_missing.at"
# 
# delete "tests/t_erename.at"
# 
# delete "tests/t_fmerge.at"
# 
# delete "tests/t_fork.at"
# 
# delete "tests/t_genkey.at"
# 
# delete "tests/t_heads.at"
# 
# delete "tests/t_heads_discontinuous_branch.at"
# 
# delete "tests/t_i18n_file.at"
# 
# delete "tests/t_import.at"
# 
# delete "tests/t_ls_missing.at"
# 
# delete "tests/t_merge.at"
# 
# delete "tests/t_merge2_add.at"
# 
# delete "tests/t_merge2_add_drop_add.at"
# 
# delete "tests/t_merge2_data.at"
# 
# delete "tests/t_merge_1.at"
# 
# delete "tests/t_merge_2.at"
# 
# delete "tests/t_merge_add.at"
# 
# delete "tests/t_merge_add_del.at"
# 
# delete "tests/t_movedel.at"
# 
# delete "tests/t_movepatch.at"
# 
# delete "tests/t_netsync.at"
# 
# delete "tests/t_netsync_pubkey.at"
# 
# delete "tests/t_netsync_repeated.at"
# 
# delete "tests/t_netsync_single.at"
# 
# delete "tests/t_netsync_unrelated.at"
# 
# delete "tests/t_null.at"
# 
# delete "tests/t_patch_drop_add.at"
# 
# delete "tests/t_persist_phrase.at"
# 
# delete "tests/t_related_merge2_data.at"
# 
# delete "tests/t_remerge.at"
# 
# delete "tests/t_rename.at"
# 
# delete "tests/t_renamed.at"
# 
# delete "tests/t_restrictions.at"
# 
# delete "tests/t_revert.at"
# 
# delete "tests/t_scan.at"
# 
# delete "tests/t_single_char_filenames.at"
# 
# delete "tests/t_singlecvs.at"
# 
# delete "tests/t_subdirs.at"
# 
# delete "tests/t_tags.at"
# 
# delete "tests/t_testresult.at"
# 
# delete "tests/t_unidiff.at"
# 
# delete "tests/t_unidiff2.at"
# 
# delete "tests/t_update.at"
# 
# delete "tests/t_update_missing.at"
# 
# delete "tests/t_update_to_revision.at"
# 
# delete "tests/t_versions.at"
# 
# patch "Makefile.am"
#  from [3c8a4501c0b6a6823dd877796008968e06d23199]
#    to [0a6e105915f36defe7b2066ebb78262845ce733f]
# 
# patch "testsuite.at"
#  from [e20997eff0240c5470652d33fb39242490d63040]
#    to [c83ecb9d36ad6f8cca0db9c9c1662a7bb535d6c3]
# 
============================================================
--- Makefile.am	3c8a4501c0b6a6823dd877796008968e06d23199
+++ Makefile.am	0a6e105915f36defe7b2066ebb78262845ce733f
@@ -235,9 +235,9 @@
 # primaries
 
 bin_PROGRAMS = mtn
-check_PROGRAMS = unit_tests
-noinst_PROGRAMS = txt2c 
-EXTRA_PROGRAMS = usher tester
+check_PROGRAMS = unit_tests tester
+noinst_PROGRAMS = txt2c
+EXTRA_PROGRAMS = usher
 
 mtn_SOURCES = $(MOST_SOURCES) monotone.cc main.cc
 usher_SOURCES = contrib/usher.cc
@@ -398,6 +398,8 @@
 	     std_hooks.lua test_hooks.lua tester.lua \
 	     testsuite.at \
 	     $(wildcard $(srcdir)/tests/t_*.at) \
+	     testsuite.lua \
+	     $(wildcard $(srcdir)/tests/*/*) \
 	     testsuite \
              tests/atconfig.in \
              tests/atlocal.in  \
@@ -453,9 +455,9 @@
 # testsuite stuff (could this possibly be more ugly?)
 
 if BUILD_UNIT_TESTS
-TESTS = unit_tests $(srcdir)/testsuite
+TESTS = unit_tests $(srcdir)/testsuite run_lua_tests
 else
-TESTS = $(srcdir)/testsuite
+TESTS = $(srcdir)/testsuite run_lua_tests
 endif
 
 TESTS_ENVIRONMENT=AUTOTEST_PATH="."
@@ -491,6 +493,12 @@
 	autom4te --language=Autotest -I $(srcdir) $< -o address@hidden
 	mv -f address@hidden $@
 
+run_lua_tests: Makefile
+	echo '#!/bin/sh' > $@ ; \
+	echo 'PATH=$(top_builddir):$$PATH' >> $@ ; \
+	echo $(top_builddir)/tester $(srcdir)/testsuite.lua >> $@ ; \
+	chmod 755 $@
+
 # we generate some headers to copy data into the executable
 
 BUILT_SOURCES_CLEAN = std_hooks.h test_hooks.h tester.h \
============================================================
--- testsuite.at	e20997eff0240c5470652d33fb39242490d63040
+++ testsuite.at	c83ecb9d36ad6f8cca0db9c9c1662a7bb535d6c3
@@ -608,66 +608,6 @@
 
 # include all the sub-tests we're going to use
 
-m4_include(tests/t_null.at)#
-m4_include(tests/t_scan.at)#
-m4_include(tests/t_import.at)#
-m4_include(tests/t_genkey.at)#
-m4_include(tests/t_unidiff.at)#
-m4_include(tests/t_persist_phrase.at)#
-m4_include(tests/t_versions.at)#
-m4_include(tests/t_fork.at)#
-m4_include(tests/t_update.at)#
-m4_include(tests/t_merge.at)#
-m4_include(tests/t_merge_add.at)#
-m4_include(tests/t_related_merge2_data.at)#
-m4_include(tests/t_merge2_add.at)#
-m4_include(tests/t_merge2_data.at)#
-m4_include(tests/t_unidiff2.at)#
-m4_include(tests/t_cwork.at)#
-m4_include(tests/t_revert.at)#
-m4_include(tests/t_add.at)#
-m4_include(tests/t_drop.at)#
-m4_include(tests/t_drop_missing.at)#
-m4_include(tests/t_cross.at)#
-m4_include(tests/t_rename.at)#
-m4_include(tests/t_renamed.at)#
-m4_include(tests/t_erename.at)#
-m4_include(tests/t_cvsimport.at)#
-m4_include(tests/t_i18n_file.at)#
-m4_include(tests/t_fmerge.at)#
-m4_include(tests/t_netsync.at)#
-m4_include(tests/t_netsync_single.at)#
-m4_include(tests/t_netsync_pubkey.at)#
-m4_include(tests/t_netsync_repeated.at)#
-m4_include(tests/t_netsync_unrelated.at)#
-m4_include(tests/t_disapprove.at)#
-m4_include(tests/t_testresult.at)#
-m4_include(tests/t_singlecvs.at)#
-m4_include(tests/t_ls_missing.at)#
-m4_include(tests/t_attributes.at)#
-m4_include(tests/t_single_char_filenames.at)#
-m4_include(tests/t_restrictions.at)#
-m4_include(tests/t_subdirs.at)#
-m4_include(tests/t_movepatch.at)#
-m4_include(tests/t_movedel.at)#
-m4_include(tests/t_remerge.at)#
-m4_include(tests/t_update_missing.at)#
-m4_include(tests/t_chkeypass.at)#
-m4_include(tests/t_diff_added_file.at)#
-m4_include(tests/t_update_to_revision.at)#
-m4_include(tests/t_heads.at)#
-m4_include(tests/t_heads_discontinuous_branch.at)#
-m4_include(tests/t_merge_1.at)#
-m4_include(tests/t_merge_2.at)#
-m4_include(tests/t_tags.at)#
-m4_include(tests/t_add_dot.at)#
-m4_include(tests/t_cleanup_empty_dir.at)#
-m4_include(tests/t_merge_add_del.at)#
-m4_include(tests/t_add_edge.at)#
-m4_include(tests/t_patch_drop_add.at)#
-m4_include(tests/t_add_drop_add.at)#
-m4_include(tests/t_merge2_add_drop_add.at)#
-m4_include(tests/t_add_patch_drop_add.at)#
 m4_include(tests/t_patch_vs_drop_add.at)
 m4_include(tests/t_explicit_merge.at)
 m4_include(tests/t_ambig_update.at)