[pacman-dev] [PATCH] sync200.py.in: remove unused substitution

Andrew Gregory andrew.gregory.8 at gmail.com
Mon Feb 9 06:58:02 UTC 2015


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 at gmail.com>
---
 Makefile.am                     |  4 ++--
 test/pacman/tests/.gitignore    |  1 -
 test/pacman/tests/Makefile.am   | 20 +-------------------
 test/pacman/tests/sync200.py    | 17 +++++++++++++++++
 test/pacman/tests/sync200.py.in | 18 ------------------
 5 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 test/pacman/tests/.gitignore
 create mode 100644 test/pacman/tests/sync200.py
 delete mode 100644 test/pacman/tests/sync200.py.in

diff --git a/Makefile.am b/Makefile.am
index 34489df..3f10d15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/test/pacman/tests/.gitignore b/test/pacman/tests/.gitignore
deleted file mode 100644
index 665d9ce..0000000
--- a/test/pacman/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-sync200.py
diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am
index dba84e3..b541b3d 100644
--- a/test/pacman/tests/Makefile.am
+++ b/test/pacman/tests/Makefile.am
@@ -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:
diff --git a/test/pacman/tests/sync200.py b/test/pacman/tests/sync200.py
new file mode 100644
index 0000000..2bcdd5d
--- /dev/null
+++ b/test/pacman/tests/sync200.py
@@ -0,0 +1,17 @@
+self.description = "Synchronize the local database"
+
+self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
+
+sp1 = pmpkg("spkg1", "1.0-1")
+sp1.depends = ["spkg2"]
+sp2 = pmpkg("spkg2", "2.0-1")
+sp2.depends = ["spkg3"]
+sp3 = pmpkg("spkg3", "3.0-1")
+sp3.depends = ["spkg1"]
+
+for sp in sp1, sp2, sp3:
+	self.addpkg2db("sync", sp)
+
+self.args = "-Sy"
+
+self.addrule("PACMAN_RETCODE=0")
diff --git a/test/pacman/tests/sync200.py.in b/test/pacman/tests/sync200.py.in
deleted file mode 100644
index 6e47112..0000000
--- a/test/pacman/tests/sync200.py.in
+++ /dev/null
@@ -1,18 +0,0 @@
-self.description = "Synchronize the local database"
-
-if len("@LIBCURL@") == 0:
-	self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
-
-sp1 = pmpkg("spkg1", "1.0-1")
-sp1.depends = ["spkg2"]
-sp2 = pmpkg("spkg2", "2.0-1")
-sp2.depends = ["spkg3"]
-sp3 = pmpkg("spkg3", "3.0-1")
-sp3.depends = ["spkg1"]
-
-for sp in sp1, sp2, sp3:
-	self.addpkg2db("sync", sp)
-
-self.args = "-Sy"
-
-self.addrule("PACMAN_RETCODE=0")
-- 
2.3.0


More information about the pacman-dev mailing list