From c3161925c29ef3dcfbb66648a91ecc50c7a0492d Mon Sep 17 00:00:00 2001
From: Andrew Gregory <andrew.gregory.8@gmail.com>
Date: Mon, 9 Feb 2015 01:58:02 -0500
Subject: 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>
---
 test/pacman/tests/.gitignore    |  1 -
 test/pacman/tests/Makefile.am   | 20 +-------------------
 test/pacman/tests/sync200.py    | 17 +++++++++++++++++
 test/pacman/tests/sync200.py.in | 18 ------------------
 4 files changed, 18 insertions(+), 38 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

(limited to 'test')

diff --git a/test/pacman/tests/.gitignore b/test/pacman/tests/.gitignore
deleted file mode 100644
index 665d9ce6..00000000
--- 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 dba84e3d..b541b3d6 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 00000000..2bcdd5d3
--- /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 6e47112d..00000000
--- 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")
-- 
cgit v1.2.3-24-g4f1b