# # # patch "Makefile.am" # from [2bbc5c3f98f24c81c68d2947f27e42cf012520a6] # to [b4d9f345f052aa763f4c86319abdd7c296390a67] # # patch "lua-testsuite.lua" # from [0ae9af3c12cea3f293bd302fde0c54c4bfa45a38] # to [349e070531e428f5be1132771f84198233143ede] # # patch "testlib.lua" # from [aafdb7ef96398c885f9e89313999027a91dffe66] # to [1f265087fe7bf1fd52204e4c518da0f9d34f7a55] # # patch "unit-testsuite.lua" # from [d5d49df91e7937d51be8c84992065755c2bc43ea] # to [ef3dd56492f8909e2ddd9905cefc4d101bbafa0c] # ============================================================ --- Makefile.am 2bbc5c3f98f24c81c68d2947f27e42cf012520a6 +++ Makefile.am b4d9f345f052aa763f4c86319abdd7c296390a67 @@ -450,39 +450,40 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEF # extra files -PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf \ - figures/difference-between-versions.pdf \ - figures/file-id-manifest-id.pdf figures/fork.pdf \ - figures/general-workflow.pdf figures/linear-history.pdf \ - figures/local-workflow.pdf figures/manifest.pdf figures/merge.pdf \ - figures/network-workflow.pdf figures/parent-child-hashes.pdf \ - figures/parent-child-names-hashes.pdf figures/parent-child.pdf \ - figures/revision-chaining.pdf figures/revision.pdf \ - figures/statement.pdf figures/three-versions.pdf \ +PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf \ + figures/difference-between-versions.pdf \ + figures/file-id-manifest-id.pdf figures/fork.pdf \ + figures/general-workflow.pdf figures/linear-history.pdf \ + figures/local-workflow.pdf figures/manifest.pdf \ + figures/merge.pdf figures/network-workflow.pdf \ + figures/parent-child-hashes.pdf \ + figures/parent-child-names-hashes.pdf figures/parent-child.pdf \ + figures/revision-chaining.pdf figures/revision.pdf \ + figures/statement.pdf figures/three-versions.pdf \ figures/two-branches.pdf PNG_FIGURES=$(addprefix $(top_builddir)/figures/,$(notdir $(PDF_FIGURES:.pdf=.png))) EPS_FIGURES=$(addprefix $(top_builddir)/figures/,$(notdir $(PDF_FIGURES:.pdf=.eps))) info_TEXINFOS = monotone.texi -EXTRA_DIST = $(PDF_FIGURES) $(PNG_FIGURES) INSTALL \ - README.changesets UPGRADE monotone.spec monotone.html \ - texinfo.css schema.sql std_hooks.lua test_hooks.lua testlib.lua \ - testsuite.lua $(srcdir)/tests tester-testsuite.lua \ - $(srcdir)/tester-tests package.m4 package_revision.txt \ - package_full_revision_dist.txt $(wildcard $(srcdir)/m4/*.m4) \ - sqlite/keywordhash.h contrib/README contrib/monoprof.sh \ - contrib/monotone-notify.pl \ - contrib/ciabot_monotone.py contrib/monotone.el \ - contrib/monotone-nav.el contrib/monotone.bash_completion \ - contrib/monotone.zsh_completion contrib/mtbrowse.sh \ - contrib/colorize contrib/color-logs.sh contrib/color-logs.conf \ - contrib/get_stdio.pl contrib/ciabot_monotone_hookversion.py \ - contrib/Monotone.pm \ - $(wildcard $(srcdir)/contrib/*.lua) contrib/usher.cc $(wildcard \ - $(srcdir)/examples/*) win32/monotone.iss win32/modpath.iss \ - $(wildcard $(srcdir)/debian/*) mac/monotone-pkg-logo.gif \ - mac/monotone.pmproj mac/package-intro.rtf audit-includes +EXTRA_DIST = $(PDF_FIGURES) $(PNG_FIGURES) INSTALL README.changesets \ + UPGRADE monotone.spec monotone.html texinfo.css schema.sql \ + std_hooks.lua test_hooks.lua testlib.lua lua-testsuite.lua \ + $(srcdir)/tests tester-testsuite.lua $(srcdir)/tester-tests \ + unit-testsuite.lua package.m4 package_revision.txt \ + package_full_revision_dist.txt $(wildcard $(srcdir)/m4/*.m4) \ + sqlite/keywordhash.h contrib/README contrib/monoprof.sh \ + contrib/monotone-notify.pl contrib/ciabot_monotone.py \ + contrib/monotone.el contrib/monotone-nav.el \ + contrib/monotone.bash_completion \ + contrib/monotone.zsh_completion contrib/mtbrowse.sh \ + contrib/colorize contrib/color-logs.sh contrib/color-logs.conf \ + contrib/get_stdio.pl contrib/ciabot_monotone_hookversion.py \ + contrib/Monotone.pm $(wildcard $(srcdir)/contrib/*.lua) \ + contrib/usher.cc $(wildcard $(srcdir)/examples/*) \ + win32/monotone.iss win32/modpath.iss $(wildcard \ + $(srcdir)/debian/*) mac/monotone-pkg-logo.gif \ + mac/monotone.pmproj mac/package-intro.rtf audit-includes MAKEINFOFLAGS=-I $(top_builddir) @@ -611,14 +612,15 @@ FORCE: # but the FORCE hack does. .PHONY: check-local FORCE FORCE: +.PRECIOUS: run_tester_tests run_unit_tests run_lua_tests mostlyclean-local: rm -rf tester_dir unit-tests package_full_revision.txt DISTCLEANFILES = mt-stdint.h xgettext.opts pch-build.hh.gch.dep \ - run_tester_tests run_unit_tests run_unit_tests \ + run_tester_tests run_unit_tests run_lua_tests \ report_tester_tests report_unit_tests report_lua_tests \ - tester-tests.status unit_tests.status lua_tests.status + tester_tests.status unit_tests.status lua_tests.status # distcheck stuff ============================================================ --- lua-testsuite.lua 0ae9af3c12cea3f293bd302fde0c54c4bfa45a38 +++ lua-testsuite.lua 349e070531e428f5be1132771f84198233143ede @@ -292,7 +292,7 @@ testdir = srcdir.."/tests" ------------------------------------------------------------------------ testdir = srcdir.."/tests" -function prepare_to_run_tests () +function prepare_to_run_tests (P) -- We have a bunch of tests that depend on being able to create -- files or directories that we cannot read or write (mostly to -- test error handling behavior). ============================================================ --- testlib.lua aafdb7ef96398c885f9e89313999027a91dffe66 +++ testlib.lua 1f265087fe7bf1fd52204e4c518da0f9d34f7a55 @@ -40,15 +40,17 @@ test.log = nil -- logfile for this test test.log = nil -- logfile for this test -- hook to be overridden by the main testsuite file, if necessary; --- called after determining the set of tests to run -function prepare_to_run_tests() +-- called after determining the set of tests to run. +-- P may be used to write messages to the user's tty. +function prepare_to_run_tests(P) return 0 end -- hook to be overridden by the main testsuite file, if necessary; -- called after opening the master logfile, but _before_ parsing -- arguments or determining the set of tests to run. -function prepare_to_enumerate_tests() +-- P may be used to write messages to the user's tty. +function prepare_to_enumerate_tests(P) return 0 end @@ -902,7 +904,7 @@ function run_tests(debugging, list_only, end logfile:write("Running on ", get_ostype(), "\n\n") - local s = prepare_to_run_tests() + local s = prepare_to_run_tests(P) if s ~= 0 then P("Test suite preparation failed.\n") return s ============================================================ --- unit-testsuite.lua d5d49df91e7937d51be8c84992065755c2bc43ea +++ unit-testsuite.lua ef3dd56492f8909e2ddd9905cefc4d101bbafa0c @@ -1,10 +1,10 @@ testdir = initial_dir .. "/unit-tests" -- This test suite is special; it synthesizes all its __driver__.lua -- files on the fly. Each one runs the 'unit_tests' binary over just -- one of the test cases it can run. testdir = initial_dir .. "/unit-tests" -function prepare_to_enumerate_tests () +function prepare_to_enumerate_tests (P) local unit_test_path = getpathof("unit_tester") if unit_test_path == nil then return 1 end @@ -42,7 +42,7 @@ end -- Cloned from testsuite.lua; just dumps information about the monotone -- build into the master logfile. -function prepare_to_run_tests () +function prepare_to_run_tests (P) local monotone_path = getpathof("mtn") if monotone_path == nil then monotone_path = "mtn" end