diff options
| author | Allan McRae <allan@archlinux.org> | 2015-02-12 04:33:20 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-02-12 04:33:20 +0100 |
| commit | 27e3125c8d65b169ac2e76c7f029ee3a4a170745 (patch) | |
| tree | 8841572774efd92ae73133ffc178038879858438 /test | |
| parent | 295a3491adc4af5c8634ac82777212ed9c664457 (diff) | |
| parent | ba869597fb64f1101012df4b0d834ed5eced0b7c (diff) | |
| download | pacman-27e3125c8d65b169ac2e76c7f029ee3a4a170745.tar.gz pacman-27e3125c8d65b169ac2e76c7f029ee3a4a170745.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/.gitignore | 1 | ||||
| -rw-r--r-- | test/pacman/tests/Makefile.am | 20 | ||||
| -rw-r--r-- | test/pacman/tests/sync200.py (renamed from test/pacman/tests/sync200.py.in) | 3 |
3 files changed, 2 insertions, 22 deletions
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"] |