On Thu, Dec 26, 2013 at 08:54:26AM -0500, Andrew Gregory wrote:

On 12/24/13 at 05:31pm, Dave Reisner wrote:

...

This avoids surprises in the build system when the wildcard matches something that autotools doesn't explicitly know about.

Signed-off-by: Dave Reisner --- test/pacman/tests/Makefile.am | 297 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 295 insertions(+), 2 deletions(-)

Surely we don't need two lists of tests; there is already one in test/pacman/tests/TESTS. If we no longer want auto-detection, we should also remove the rule in top-level Makefile to rebuild the test list.

Right, this patch probably should have been tagged as an RFC. The point is indeed that we want to get rid of autodetection, because it's the wrong thing to do with autotools.

...

diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index 9ab0c77..ed3e900 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -1,8 +1,298 @@ CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in))

check_SCRIPTS = \ - $(wildcard *.py) \ - $(CONFTESTS) + $(CONFTESTS) \ + clean001.py \ + clean002.py \ + clean003.py \ + clean004.py \ + clean005.py \ + config001.py \ + config002.py \ + database001.py \ + database002.py \ + database010.py \ + database011.py \ + database012.py \ + depconflict100.py \ + depconflict110.py \ + depconflict111.py \ + depconflict120.py \ + deptest001.py \ + dummy001.py \ + epoch001.py \ + epoch002.py \ + epoch003.py \ + epoch004.py \ + epoch005.py \ + epoch010.py \ + epoch011.py \ + epoch012.py \ + fileconflict001.py \ + fileconflict002.py \ + fileconflict003.py \ + fileconflict004.py \ + fileconflict005.py \ + fileconflict006.py \ + fileconflict007.py \ + fileconflict008.py \ + fileconflict009.py \ + fileconflict010.py \ + fileconflict011.py \ + fileconflict012.py \ + fileconflict013.py \ + fileconflict015.py \ + fileconflict016.py \ + fileconflict017.py \ + fileconflict020.py \ + fileconflict021.py \ + fileconflict022.py \ + fileconflict023.py \ + fileconflict024.py \ + fileconflict025.py \ + fileconflict030.py \ + fileconflict031.py \ + fileconflict032.py \ + ignore001.py \ + ignore002.py \ + ignore003.py \ + ignore004.py \ + ignore005.py \ + ignore006.py \ + ignore007.py \ + ignore008.py \ + ldconfig001.py \ + ldconfig002.py \ + ldconfig003.py \ + mode001.py \ + mode002.py \ + mode003.py \ + pacman001.py \ + pacman002.py \ + pacman003.py \ + pacman004.py \ + pacman005.py \ + provision001.py \ + provision002.py \ + provision003.py \ + provision004.py \ + provision010.py \ + provision011.py \ + provision012.py \ + provision020.py \ + provision021.py \ + provision022.py \ + query001.py \ + query002.py \ + query003.py \ + query004.py \ + query005.py \ + query006.py \ + query007.py \ + query010.py \ + query011.py \ + query012.py \ + reason001.py \ + remove001.py \ + remove002.py \ + remove010.py \ + remove011.py \ + remove012.py \ + remove020.py \ + remove021.py \ + remove030.py \ + remove031.py \ + remove040.py \ + remove041.py \ + remove042.py \ + remove043.py \ + remove044.py \ + remove045.py \ + remove047.py \ + remove049.py \ + remove050.py \ + remove051.py \ + remove052.py \ + remove060.py \ + remove070.py \ + remove071.py \ + replace100.py \ + replace101.py \ + replace102.py \ + replace103.py \ + replace104.py \ + replace110.py \ + scriptlet001.py \ + scriptlet002.py \ + sign001.py \ + sign002.py \ + smoke001.py \ + smoke002.py \ + smoke003.py \ + smoke004.py \ + symlink001.py \ + symlink002.py \ + symlink010.py \ + symlink011.py \ + symlink012.py \ + symlink020.py \ + sync-nodepversion01.py \ + sync-nodepversion02.py \ + sync-nodepversion03.py \ + sync-nodepversion04.py \ + sync-nodepversion05.py \ + sync-nodepversion06.py \ + sync001.py \ + sync002.py \ + sync003.py \ + sync009.py \ + sync010.py \ + sync011.py \ + sync012.py \ + sync020.py \ + sync021.py \ + sync022.py \ + sync023.py \ + sync024.py \ + sync030.py \ + sync031.py \ + sync040.py \ + sync041.py \ + sync042.py \ + sync043.py \ + sync044.py \ + sync045.py \ + sync050.py \ + sync051.py \ + sync052.py \ + sync100.py \ + sync101.py \ + sync102.py \ + sync103.py \ + sync104.py \ + sync110.py \ + sync120.py \ + sync130.py \ + sync131.py \ + sync132.py \ + sync133.py \ + sync134.py \ + sync135.py \ + sync136.py \ + sync137.py \ + sync138.py \ + sync139.py \ + sync140.py \ + sync141.py \ + sync150.py \ + sync200.py \ + sync300.py \ + sync306.py \ + sync400.py \ + sync401.py \ + sync402.py \ + sync403.py \ + sync404.py \ + sync405.py \ + sync406.py \ + sync407.py \ + sync500.py \ + sync501.py \ + sync502.py \ + sync503.py \ + sync600.py \ + sync700.py \ + sync701.py \ + sync702.py \ + sync890.py \ + sync891.py \ + sync892.py \ + sync893.py \ + sync895.py \ + sync896.py \ + sync897.py \ + sync898.py \ + sync899.py \ + sync900.py \ + sync901.py \ + sync990.py \ + sync992.py \ + sync993.py \ + sync999.py \ + sync1000.py \ + sync1003.py \ + sync1004.py \ + sync1008.py \ + sync1100.py \ + sync1101.py \ + sync1102.py \ + sync1103.py \ + sync1104.py \ + sync1105.py \ + trans001.py \ + type001.py \ + unresolvable001.py \ + upgrade001.py \ + upgrade002.py \ + upgrade003.py \ + upgrade004.py \ + upgrade005.py \ + upgrade006.py \ + upgrade010.py \ + upgrade011.py \ + upgrade012.py \ + upgrade013.py \ + upgrade014.py \ + upgrade015.py \ + upgrade016.py \ + upgrade020.py \ + upgrade021.py \ + upgrade022.py \ + upgrade023.py \ + upgrade024.py \ + upgrade025.py \ + upgrade026.py \ + upgrade027.py \ + upgrade028.py \ + upgrade029.py \ + upgrade030.py \ + upgrade031.py \ + upgrade032.py \ + upgrade040.py \ + upgrade041.py \ + upgrade042.py \ + upgrade043.py \ + upgrade045.py \ + upgrade046.py \ + upgrade050.py \ + upgrade051.py \ + upgrade052.py \ + upgrade053.py \ + upgrade054.py \ + upgrade055.py \ + upgrade056.py \ + upgrade057.py \ + upgrade058.py \ + upgrade059.py \ + upgrade060.py \ + upgrade061.py \ + upgrade070.py \ + upgrade071.py \ + upgrade072.py \ + upgrade073.py \ + upgrade074.py \ + upgrade075.py \ + upgrade076.py \ + upgrade077.py \ + upgrade078.py \ + upgrade080.py \ + upgrade081.py \ + upgrade082.py \ + upgrade083.py \ + upgrade084.py \ + upgrade090.py \ + upgrade100.py \ + xfercommand001.py

noinst_SCRIPTS = $(check_SCRIPTS)

@@ -10,6 +300,9 @@ EXTRA_DIST = $(check_SCRIPTS)

CLEANFILES = $(CONFTESTS)

+%.py: %.py.in + $(AM_V_GEN)test -f $(srcdir)/$@.in && m4 -P -I $(srcdir) $(srcdir)/$@.py.in | $(edit) >$@.py + #### Taken from the autoconf scripts Makefile.am #### edit = sed \ -e 's|@LIBCURL[@]|$(LIBCURL)|g' \ -- 1.8.5.2