- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: clear destination array in array_build
by Allan McRae 12 Jan '15

12 Jan '15

If an already used array is passed array_build, some entries from the old array could be carried over if the old array was longer than the new one. Clear the destination array before adding elements to it to prevent this issue. Fixes: https://bugs.archlinux.org/task/43387 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1720e64..00beb76 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2467,6 +2467,9 @@ array_build() { # Build an array of the indicies of the source array. eval "keys=(\"\${!$2[@]}\")" + # Clear the destination array + eval "$dest=()" + # Read values indirectly via their index. This approach gives us support # for associative arrays, sparse arrays, and empty strings as elements. for i in "${keys[@]}"; do -- 2.2.1

1 0

[pacman-dev] [PATCH] makepkg: avoid duplication in source fetching
by Dave Reisner 12 Jan '15

12 Jan '15

Unique the return lists of sources to prevent duplication which occurs because of merge_arch_attrs. Fixes: https://bugs.archlinux.org/task/43387 --- scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1720e64..85e297a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -792,6 +792,9 @@ get_all_sources() { fi done + # TODO(dreisner): get rid of this once merge_arch_attrs is dead + mapfile -t aggregate < <(printf '%s\n' "${aggregate[@]}" | awk '!a[$0]++') + array_build "$1" "aggregate" } @@ -806,6 +809,9 @@ get_all_sources_for_arch() { aggregate+=("${l[@]}") fi + # TODO(dreisner): get rid of this once merge_arch_attrs is dead + mapfile -t aggregate < <(printf '%s\n' "${aggregate[@]}" | awk '!a[$0]++') + array_build "$1" "aggregate" } @@ -1607,6 +1613,8 @@ source_safe() { shopt -s extglob } +# TODO(dreisner): kill off this function and consistently access arch-specific +# attributes throughout. merge_arch_attrs() { local attr supported_attrs=( provides conflicts depends replaces optdepends -- 2.2.1

2 2

[pacman-dev] [PATCH 0/7] [RFC] extract_single_file cleanup
by Andrew Gregory 11 Jan '15

11 Jan '15

This is my attempt to clean up the behemoth extract_single_file function. In order to do this I have made the following user-visible changes that I would like feedback on: * skip mtree, noupgrade, noextract checks for db files * remove .pacorig support, use .pacnew instead * extract backup files directly to .pacnew instead of .paccheck This takes extract_single_file down from 340 lines to 225 and considerably reduces the number of nested conditionals Andrew Gregory (7): extract_single_file: consolidate needbackup checks extract_single_file: reduce indentation extract_single_file: factor out db file extraction extract_single_file: use full path in messages remove support for .pacorig files extract_single_file: use .pacnew for check files extract_single_file: consolidate extraction logic contrib/README | 2 +- contrib/pacdiff.sh.in | 9 +- doc/pacman.8.txt | 5 +- lib/libalpm/add.c | 413 ++++++++++++++++------------------------ lib/libalpm/alpm.h | 15 +- src/pacman/callback.c | 16 -- test/pacman/README | 1 - test/pacman/pmrule.py | 3 - test/pacman/tests/upgrade015.py | 1 - test/pacman/tests/upgrade016.py | 5 +- test/pacman/tests/upgrade027.py | 1 - test/pacman/tests/upgrade028.py | 1 - test/pacman/tests/upgrade029.py | 1 - 13 files changed, 171 insertions(+), 302 deletions(-) -- 2.1.1

3 16

[pacman-dev] IgnorePkg for specific package versions
by Daniel Schoepe 11 Jan '15

11 Jan '15

Hi everyone, I think that it would be nice to be able to specify particular version constraints for packages to be ignored in IgnorePkg / --ignore, like it was suggested on the forums [1]. This would be helpful for preventing particular buggy versions from being installed but trying each update after that. Regarding the comment that partial upgrades are not supported: This is "invariant" is already being broken by having IgnorePkg in the first place, so I don't think this proposal makes it worse. It turns out that this is *almost* very easy to implement by converting each element of handle->ignorepkg to an alpm_depend_t and then comparing with _alpm_dec_literal(). However, this does not quite work since some ignore-checks also check if the local package matches the ignore rule, which leads to arguably counter-intuitive results when used with lower bounds: If package-0.1-1 is installed and package-0.2-1 has a bug, a user might write package<=0.2-1 in IgnorePkg, but this leads to the package never being upgrade anymore since the local version (0.1-1) matches this condition. So I have a couple of questions: Do you think this is a sensible feature to have in the first place? If so, how should the potential problem above be handled? These are the most reasonable options that I could come up with: 1. Don't compare with the local version anymore: This has the downside of altering the semantics of IgnorePkg even if the user does not change their config. 2. Implement the less intuitive semantics that would result from my suggested change. This is not so nice since a common use case might be to wait until a particular version that fixes some bug is released. A new package release of the same version would usually not help then. 3. Restrict the syntax to only allow equality comparisons in IgnorePkg. This prevents the use case from 2 as well. 4. Do not compare with the old version if and only if a version constraint is given on for this package. This has the advantage of not affecting anybody using IgnorePkg at the moment and anyone using version constraints can be made aware of this behaviour. However, this is somewhat ad-hoc and asymmetric. Any comments and input is appreciated. Cheers, Daniel [1] https://bbs.archlinux.org/viewtopic.php?id=182893

2 1

[pacman-dev] Bazaar branch check in makepkg
by David Macek 11 Jan '15

11 Jan '15

Hi all. I'm posting this on behalf of an MSYS2 user. We'd like to hear your opinion on removing this check from makepkg, which has been causing some troubles apparently. The patch: https://raw.githubusercontent.com/renatosilva/MSYS2-packages/e006c48770281b… His comment: There was some manual check to know if the existing repository is actually a clone of the branch specified in $source. However this check needs to be semantic, not a simple string comparison. For example, I was blocked from building a PKGBUILD which uses a Bazaar repository in $source, because Bazaar was returning two different strings for the same location (for HTTP one was url-encoded while the other was not, and for local paths one was absolute while the other was relative). While this may be a bug in Bazaar, the check is unreliable since the comparison is not semantic (http://foo.com/%2Bplus and http://foo.com/+plus obviously refer to the same location for example). It is also useless because the intention is updating the existing local clone. However, if the local clone is not a real clone of the repository specified in $source (which is what this buggy check tries to tell), next step which is a pull operation will fail anyway. I'm not sure why this kind of code is used but it looks pretty useless for any VCS at all. Maybe they wanted to avoid that non-clones successfully pulled from $source (for example if the non-clone simply just lacks some commits), but isn't this a corner case? Anyway, upstream may be interested in removing these checks for all VCS systems. -- David Macek

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-81-g0108884
by allan＠archlinux.org 11 Jan '15

11 Jan '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 0108884952415b4e7c5fe93a1422f441f4bea0aa (commit) via d5f703729f60b604eec0e2d7bc59bb6cc273e66f (commit) via bd2473797e634723e1406315c37e1bed72595267 (commit) via 6201f6e5acca08268d6a019a72b76c1318d4dbd5 (commit) via 4dd9ccbc7883ddaaba7f633dba2a4bb3ef5ffcc3 (commit) via 17ad845c41c5713ca62e6cea47948a82a2d601a1 (commit) via 287f7a575e8d09d695a9a3e9a95c0196f03648f4 (commit) via dfacd8473e6d83042f5d01f2cfc61b7bd43a7617 (commit) via 107eabdfb34891824807f6dc9c1e40fb91c76c26 (commit) via 207ba1e05f79e30c1cbae84549311c8a1e370c93 (commit) via ca5af32b9931172387cf3df47cece22bf1523186 (commit) via f617b6acd4e33586819ac5728825cbdcac12f042 (commit) via 77ca6e40622cea463c601566a85b40ebaea69598 (commit) via e8d757b6ba9ca545266c43279cfef1a48971c013 (commit) via fb9db2df5d1188b87f5763e4681f7f6d1b7ff988 (commit) via 83d5512bf1f8b1321e239cb8efdcb3547213d011 (commit) via 9e5e86aa146f6a63880df5ae17340156f7315eb0 (commit) from 95da285f5670a56faf3bac0d999a6ba6d7153fab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0108884952415b4e7c5fe93a1422f441f4bea0aa Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add update-version-with-newest-option Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit d5f703729f60b604eec0e2d7bc59bb6cc273e66f Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add template-without-version Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit bd2473797e634723e1406315c37e1bed72595267 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add name-charset-valid Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 6201f6e5acca08268d6a019a72b76c1318d4dbd5 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add name-charset-invalid Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 4dd9ccbc7883ddaaba7f633dba2a4bb3ef5ffcc3 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add missing-template-symlink Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 17ad845c41c5713ca62e6cea47948a82a2d601a1 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add missing-template-file Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 287f7a575e8d09d695a9a3e9a95c0196f03648f4 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add keep-old-version Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit dfacd8473e6d83042f5d01f2cfc61b7bd43a7617 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add invalid-template-line-unknown-marker Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 107eabdfb34891824807f6dc9c1e40fb91c76c26 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add invalid-template-line-missing-name Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 207ba1e05f79e30c1cbae84549311c8a1e370c93 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:48:57 2014 +0100 test makepkg-template: Add invalid-key Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit ca5af32b9931172387cf3df47cece22bf1523186 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 15:46:37 2014 +0100 Add testrunner for makepkg-template Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit f617b6acd4e33586819ac5728825cbdcac12f042 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 28 15:56:53 2014 +0100 makepkg-template: Remove linenumber/file from errors die prints "at $scriptname line $linenumber." if the string does not end with "\n". This information is not of much use for us and it makes testing harder because we'd to remove it there. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 77ca6e40622cea463c601566a85b40ebaea69598 Merge: 95da285 e8d757b Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 11 18:57:54 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 + contrib/paccache.sh.in | 2 + scripts/makepkg-template.pl.in | 4 +- scripts/makepkg.sh.in | 8 ++- test/scripts/Makefile.am | 1 + .../makepkg-template-tests/invalid-key/PKGBUILD | 1 + .../invalid-key/testcase-config | 11 ++++ .../invalid-template-line-missing-name/PKGBUILD | 1 + .../testcase-config | 11 ++++ .../invalid-template-line-unknown-marker/PKGBUILD | 9 +++ .../testcase-config | 11 ++++ .../keep-old-version/PKGBUILD | 15 +++++ .../templates/perl-bla-1.2.template | 1 + .../templates/perl-module-1.0.template | 6 ++ .../templates/perl-module-1.1.template | 7 +++ .../keep-old-version/testcase-config | 29 ++++++++++ .../missing-template-file/PKGBUILD | 7 +++ .../missing-template-file/testcase-config | 14 +++++ .../missing-template-symlink/PKGBUILD | 7 +++ .../templates/perl-module-1.0.template | 1 + .../missing-template-symlink/testcase-config | 9 +++ .../name-charset-invalid/PKGBUILD | 8 +++ .../name-charset-invalid/testcase-config | 10 ++++ .../name-charset-valid/PKGBUILD | 8 +++ .../templates/foo@-_.+a-1.template | 1 + .../name-charset-valid/testcase-config | 19 ++++++ .../template-without-version/PKGBUILD | 8 +++ .../templates/template-without_version.template | 0 .../template-without-version/testcase-config | 9 +++ .../testcase-config-template | 9 +++ .../update-version-with-newest-option/PKGBUILD | 7 +++ .../templates/perl-bla-1.2.template | 1 + .../templates/perl-module-1.0.template | 6 ++ .../templates/perl-module-1.1.template | 7 +++ .../testcase-config | 29 ++++++++++ test/scripts/makepkg-template_test.sh | 67 ++++++++++++++++++++++ 36 files changed, 341 insertions(+), 5 deletions(-) create mode 100644 test/scripts/makepkg-template-tests/invalid-key/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/invalid-key/testcase-config create mode 100644 test/scripts/makepkg-template-tests/invalid-template-line-missing-name/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/invalid-template-line-missing-name/testcase-config create mode 100644 test/scripts/makepkg-template-tests/invalid-template-line-unknown-marker/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/invalid-template-line-unknown-marker/testcase-config create mode 100644 test/scripts/makepkg-template-tests/keep-old-version/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/keep-old-version/templates/perl-bla-1.2.template create mode 100644 test/scripts/makepkg-template-tests/keep-old-version/templates/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/keep-old-version/templates/perl-module-1.1.template create mode 100644 test/scripts/makepkg-template-tests/keep-old-version/testcase-config create mode 100644 test/scripts/makepkg-template-tests/missing-template-file/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/missing-template-file/testcase-config create mode 100644 test/scripts/makepkg-template-tests/missing-template-symlink/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/missing-template-symlink/templates/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/missing-template-symlink/testcase-config create mode 100644 test/scripts/makepkg-template-tests/name-charset-invalid/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/name-charset-invalid/testcase-config create mode 100644 test/scripts/makepkg-template-tests/name-charset-valid/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/name-charset-valid/templates/foo@-_.+a-1.template create mode 100644 test/scripts/makepkg-template-tests/name-charset-valid/testcase-config create mode 100644 test/scripts/makepkg-template-tests/template-without-version/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/template-without-version/templates/template-without_version.template create mode 100644 test/scripts/makepkg-template-tests/template-without-version/testcase-config create mode 100644 test/scripts/makepkg-template-tests/testcase-config-template create mode 100644 test/scripts/makepkg-template-tests/update-version-with-newest-option/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/update-version-with-newest-option/templates/perl-bla-1.2.template create mode 100644 test/scripts/makepkg-template-tests/update-version-with-newest-option/templates/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/update-version-with-newest-option/templates/perl-module-1.1.template create mode 100644 test/scripts/makepkg-template-tests/update-version-with-newest-option/testcase-config create mode 100755 test/scripts/makepkg-template_test.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-21-ge8d757b
by allan＠archlinux.org 11 Jan '15

11 Jan '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via e8d757b6ba9ca545266c43279cfef1a48971c013 (commit) via fb9db2df5d1188b87f5763e4681f7f6d1b7ff988 (commit) via 83d5512bf1f8b1321e239cb8efdcb3547213d011 (commit) via 9e5e86aa146f6a63880df5ae17340156f7315eb0 (commit) from 89b9e9d1dced68587b704cb9e9a2aab55fb60b06 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e8d757b6ba9ca545266c43279cfef1a48971c013 Author: Dario Giovannetti <dariogiova(a)gmail.com> Date: Sat Jan 3 00:11:04 2015 +0800 paccache: exit in case of pacman error when -u flag is used Fixes https://bugs.archlinux.org/task/43286 Signed-off-by: Dario Giovannetti <dariogiova(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fb9db2df5d1188b87f5763e4681f7f6d1b7ff988 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jan 9 14:57:37 2015 -0500 makepkg: restore attr merging for write_pkginfo acc639adf20d removed this, but shouldn't have. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 83d5512bf1f8b1321e239cb8efdcb3547213d011 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jan 9 14:55:36 2015 -0500 makepkg: avoid nested quoting in string replacement I suspect this is just wrong -- you never need to quote the replacement side of a PE. In bash 4.3, this is essentially a no-op, but because of a bug in bash 4.2, we get embedded quotes as a result of this replacement. The relevant changelog item in bash is: Fixed a bug that caused single quotes that resulted from $'...' quoting in the replacement portion of a double-quoted ${word/pat/rep} expansion to be treated as quote characters. But this doesn't apply to us. Let's just drop the excessive quoting... Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9e5e86aa146f6a63880df5ae17340156f7315eb0 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 10 19:36:35 2015 +1000 makepkg: fix removing static libraries when shared use absolute symlinks When a shared library uses an absolute symlink for its its .so file, the check if the shared version of a static library exists fails. Test for the presence of a broken symlink too. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.sh.in | 2 ++ scripts/makepkg.sh.in | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Pacman Hooks file format
by Sam S. 11 Jan '15

11 Jan '15

Hi pacman devs! Allan pointed me to https://wiki.archlinux.org/index.php/User:Allan/Pacman_Hooks in his blog comments, and I think it's great that such hooks will be added to pacman (hopefully for the next release)! I've got a small suggestion for the file format for specifying the hooks. If it is already set in stone please disregard this email; This is just in case it's still open to brainstorming: Did you consider separating the options by whether they define the trigger, or specify the action to be run for each instance where the hook was triggered? This might make the format more self-explanatory, and more extensible in case support for more complicated triggers/actions is added in the future. So instead of: [Hook] Description = Add info files to the info directory Type = PostTransaction [Target] File = /usr/share/info/* Exec = install-info %f /usr/share/info/dir &>/dev/null It might read: [Hook] Description = Add info files to the info directory [Trigger] FileInstalled = /usr/share/info/* [Action] Stage = PostTransaction Exec = install-info %f /usr/share/info/dir &>/dev/null

2 1

[pacman-dev] [PATCH] makepkg: fix stripping static libraries when shared use absolute symlinks
by Allan McRae 10 Jan '15

10 Jan '15

When a shared library uses an absolute symlink for its its .so file, the check if the shared version of a static library exists fails. Test for the presence of a broken symlink too. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- A workaround for bad software, but we need to do this unless we want to ensure all symlinks are relative scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 880e778..be12940 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1833,7 +1833,7 @@ tidy_install() { # check existence of backup files local file for file in "${backup[@]}"; do - if [[ ! -f $file ]]; then + if [[ ! -f $file && ! -h $file ]]; then warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" fi done -- 2.2.1

1 1

[pacman-dev] [PATCH 01/11] Add testrunner for makepkg-template
by Florian Pritz 10 Jan '15

10 Jan '15

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile.am | 2 + test/scripts/Makefile.am | 1 + test/scripts/makepkg-template-tests/.gitignore | 3 + test/scripts/makepkg-template_test.sh | 86 ++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 test/scripts/makepkg-template-tests/.gitignore create mode 100755 test/scripts/makepkg-template_test.sh diff --git a/Makefile.am b/Makefile.am index e9b3dfa..ab669ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ $(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py*) TESTS = test/scripts/parseopts_test.sh \ test/scripts/human_to_size_test.sh \ + test/scripts/makepkg-template_test.sh \ test/scripts/pacman-db-upgrade-v9.py \ test/util/pacsorttest.sh \ test/util/vercmptest.sh @@ -37,6 +38,7 @@ TEST_SUITE_LOG = test/test-suite.log TEST_EXTENSIONS = .py AM_TESTS_ENVIRONMENT = \ PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \ + PMTEST_SCRIPT_DIR=$(top_srcdir)/scripts/; export PMTEST_SCRIPT_DIR; \ PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index 8d6bc84..ed1a951 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -1,6 +1,7 @@ check_SCRIPTS = \ parseopts_test.sh \ pacman-db-upgrade-v9.py \ + makepkg-template_test.sh \ human_to_size_test.sh noinst_SCRIPTS = $(check_SCRIPTS) diff --git a/test/scripts/makepkg-template-tests/.gitignore b/test/scripts/makepkg-template-tests/.gitignore new file mode 100644 index 0000000..c6fc2ee --- /dev/null +++ b/test/scripts/makepkg-template-tests/.gitignore @@ -0,0 +1,3 @@ +result +output +output_full diff --git a/test/scripts/makepkg-template_test.sh b/test/scripts/makepkg-template_test.sh new file mode 100755 index 0000000..b036b74 --- /dev/null +++ b/test/scripts/makepkg-template_test.sh @@ -0,0 +1,86 @@ +#!/bin/bash + +declare -i testcount=0 fail=0 pass=0 total=0 + +# source the library function +scriptdir=${1:-${PMTEST_SCRIPT_DIR}} +if [[ -z $scriptdir || ! -f $scriptdir/makepkg-template ]]; then + printf "Bail out! makepkg-template executable (%s) could not be located\n" "${scriptdir}/makepkg-template" + exit 1 +fi + +testdir="${0%/*}/makepkg-template-tests" + +total=$(find "$testdir" -maxdepth 1 -mindepth 1 -type d | wc -l) + +run_test() { + local testcase=$1 exitcode + local -i failed=0 + + (( ++testcount )) + + local -a arguments + + if [[ -f "$testdir/$testcase/arguments" ]]; then + arguments=($(cat "$testdir/$testcase/arguments")) + fi + + rm -f "$testdir/$testcase/result" + + "$scriptdir/makepkg-template" \ + --template-dir "$testdir/$testcase/templates" \ + -p "$testdir/$testcase/PKGBUILD" \ + -o "$testdir/$testcase/result" \ + &> "$testdir/$testcase/output_full" "${arguments[@]}" + exitcode=$? + + sed "$testdir/$testcase/output_full" >"$testdir/$testcase/output" \ + -e 's|./test/scripts/|./|' \ + -e 's| at '$scriptdir'/makepkg-template line [0-9]\+\.$||' + printf "%s\n" "$exitcode" >> "$testdir/$testcase/output" + + if [[ -f "$testdir/$testcase/result" ]]; then + if ! diff -u "$testdir/$testcase/"{result,expected_result}; then + failed=1 + fi + else + if [[ -f "$testdir/$testcase/expected_result" ]]; then + echo "$testcase: Found expected_result file but no result file" + failed=1 + fi + fi + + if ! diff -u "$testdir/$testcase/"{output,expected_output}; then + failed=1 + fi + + if ((!failed)); then + (( ++pass )) + printf "ok %d - %s\n" "$testcount" "$input" + else + (( ++fail )) + printf "not ok %d - %s\n" "$testcount" "$input" + printf '# [TEST %3s]: FAIL\n' "$testcount" + fi +} + +summarize() { + if (( !fail )); then + printf '# All %s tests successful\n\n' "$testcount" + exit 0 + else + printf '# %s of %s tests failed\n\n' "$fail" "$testcount" + exit 1 + fi +} +trap 'summarize' EXIT + +printf '# Beginning makepkg-template tests\n' + +echo "1..$total" + +for dir in "$testdir/"*; do + if [[ -d "$dir" ]]; then + run_test "${dir##*/}" + fi +done -- 2.2.1

3 32