sync200.py.in: remove unused substitution

LIBCURL was never set in the Makefile so XferCommand was always being
set in the test file.  This removes the only substitution in our test
files which will prevent the TESTS file from being rebuilt every time
configure is run.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2015-02-09 01:58:02 -05:00 committed by Allan McRae
parent 10fc538c70
commit c3161925c2
4 changed files with 4 additions and 24 deletions

View File

@ -23,8 +23,8 @@ dist_pkgdata_DATA = \
proto/PKGBUILD-vcs.proto \
proto/proto.install
$(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*)
@printf "TESTS += %s\n" $^ | sed -e "s/\.py\.in/.py/" | LC_ALL=C sort -u > "$@"
$(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py)
@printf "TESTS += %s\n" $^ | LC_ALL=C sort -u > "$@"
TESTS = test/scripts/parseopts_test.sh \
test/scripts/human_to_size_test.sh \

View File

@ -1 +0,0 @@
sync200.py

View File

@ -1,25 +1,7 @@
CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in))
check_SCRIPTS = \
$(wildcard *.py) \
$(CONFTESTS)
check_SCRIPTS = $(wildcard *.py)
noinst_SCRIPTS = $(check_SCRIPTS)
EXTRA_DIST = $(check_SCRIPTS)
CLEANFILES = $(CONFTESTS)
#### Taken from the autoconf scripts Makefile.am ####
edit = sed \
-e 's|@LIBCURL[@]|$(LIBCURL)|g' \
-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
$(CONFTESTS): Makefile
$(AM_V_at)$(RM) $@ $@.tmp
$(AM_V_GEN)test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true
$(AM_V_at)chmod a-w $@.tmp
$(AM_V_at)mv $@.tmp $@
# vim:set noet:

View File

@ -1,7 +1,6 @@
self.description = "Synchronize the local database"
if len("@LIBCURL@") == 0:
self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
sp1 = pmpkg("spkg1", "1.0-1")
sp1.depends = ["spkg2"]