Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--test/pacman/tests/.gitignore1
-rw-r--r--test/pacman/tests/Makefile.am20
-rw-r--r--test/pacman/tests/sync200.py (renamed from test/pacman/tests/sync200.py.in)3
4 files changed, 4 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am
index e9b3dfa1..4f807f9a 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 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.in b/test/pacman/tests/sync200.py
index 6e47112d..2bcdd5d3 100644
--- a/test/pacman/tests/sync200.py.in
+++ b/test/pacman/tests/sync200.py
@@ -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"]