[gentoo-commits] proj/portage-utils:master commit in: tests/

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Mike Frysinger]

commit:     4aff1f7cb3d81e05a780b7d2b3e2cb5b4e0d8109
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 15:39:32 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 15:39:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4aff1f7c

tests: avoid reading host config settings

Make sure the host's settings don't get loaded by accident as they
might cause misbehavior in the tests.  We want these to be hermetic.

 tests/init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/init.sh b/tests/init.sh
index e2c3562..b3f634e 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -31,6 +31,8 @@ setup_env
 
 # clean any random vars from the host system
 unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET
+# but make sure we don't implicitly rely on user's setup
+export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
 
 q -i -q
 

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     d57f8516cfad348c7871ebeee81b11ef6fcf4acf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 15:32:15 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 15:32:15 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d57f8516

tests/init: remove last Travis cruft

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index 248e343..2b0a65f 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -32,12 +32,9 @@ export TZ='UTC 0'
 q -i -q
 
 # inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu
-# used by Travis segfaults on qmanifest and qcheck, so disable there to
-# be able to run the rest regularly
+# causes qmanifest to print stuff double, so skip it for that applet
 dovalgrind=${Q_RUN_WITH_VALGRIND}
-[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
-[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qcheck ]] && dovalgrind=
-[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmerge ]] && dovalgrind=
+[[ ${RUNNER_OS}:${as##*/} == Linux:qmanifest ]] && dovalgrind=
 if [[ -n ${dovalgrind} ]] ; then
 	chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
 	for f in @abs_top_builddir@/q?* ; do

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     7c6f5256f98b2804626cf7c0d8518e1792099183
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 27 17:57:18 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 27 17:57:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=7c6f5256

tests/init.sh.in: filter NOCOLOR, bug #830105

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index c44320b..248e343 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -22,7 +22,7 @@ setup_env() {
 setup_env
 
 # clean any random vars from the host system
-unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET PORTDIR
+unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET PORTDIR NOCOLOR
 # but make sure we don't implicitly rely on user's setup
 export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
 # Always use UTC for timestamps to keep tests stable. #551806

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     95abc1123af8697a97425f515c9efa7d3259487f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 23 11:42:04 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 11:42:04 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=95abc112

Revert "tests/init: force colours off for all tests"

This reverts commit 704a36ae325d8cbd3cee5b40cd4ad7bf937ab724.
It actually hides a problem (as seen in bug #829837)

Bug: https://bugs.gentoo.org/829837
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index c030156..c44320b 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -27,8 +27,6 @@ unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET PORTDIR
 export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
 # Always use UTC for timestamps to keep tests stable. #551806
 export TZ='UTC 0'
-# don't use colours
-export NOCOLOR=true
 
 # create symlinks for applets
 q -i -q

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     704a36ae325d8cbd3cee5b40cd4ad7bf937ab724
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 07:24:37 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 07:24:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=704a36ae

tests/init: force colours off for all tests

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index c44320b..c030156 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -27,6 +27,8 @@ unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET PORTDIR
 export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
 # Always use UTC for timestamps to keep tests stable. #551806
 export TZ='UTC 0'
+# don't use colours
+export NOCOLOR=true
 
 # create symlinks for applets
 q -i -q

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     e63b811e6f81e2a2d85137195d58f17bb4543c52
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 19:14:53 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 25 19:14:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e63b811e

test/init: qmerge makes valgrind coredump too, Travis--

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index 8b67070..c44320b 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -37,6 +37,7 @@ q -i -q
 dovalgrind=${Q_RUN_WITH_VALGRIND}
 [[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
 [[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qcheck ]] && dovalgrind=
+[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmerge ]] && dovalgrind=
 if [[ -n ${dovalgrind} ]] ; then
 	chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
 	for f in @abs_top_builddir@/q?* ; do

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     d0e3592a032d607f2668d89fde671110586c3b90
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 19:05:51 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 25 19:05:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d0e3592a

tests/init: re-enact valgrind block on Travis

Somehow Travis env cannot be replicated, and still has a coredumping
valgrind

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index 6cdfccf..8b67070 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -35,6 +35,8 @@ q -i -q
 # used by Travis segfaults on qmanifest and qcheck, so disable there to
 # be able to run the rest regularly
 dovalgrind=${Q_RUN_WITH_VALGRIND}
+[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
+[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qcheck ]] && dovalgrind=
 if [[ -n ${dovalgrind} ]] ; then
 	chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
 	for f in @abs_top_builddir@/q?* ; do

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     93ab3a3b0a280d83d5d65af2e4740cb3227a38a2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 18:38:49 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 25 18:38:49 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=93ab3a3b

tests/init: drop valgrind exclusions

After some manual testing and fixes on a Bionic VM, valgrind no longer
dumps core there, so let's hope we can finally run the full suite using
valgrind on Travis too.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index 8b67070..6cdfccf 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -35,8 +35,6 @@ q -i -q
 # used by Travis segfaults on qmanifest and qcheck, so disable there to
 # be able to run the rest regularly
 dovalgrind=${Q_RUN_WITH_VALGRIND}
-[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
-[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qcheck ]] && dovalgrind=
 if [[ -n ${dovalgrind} ]] ; then
 	chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
 	for f in @abs_top_builddir@/q?* ; do

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     87aee5be6981ecf3dc30614f273488ab3a87bde9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 13:05:29 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 13:05:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=87aee5be

tests/init.sh: clear PORTDIR from env

Portage seems to inject PORTDIR (with a weird value) in the environment.
This shows up during make check on some systems.  (Bug #701402.)
Always remove it from the environment to avoid interference.

Bug: https://bugs.gentoo.org/701402
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index 7f5db06..5ffc7ef 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -22,7 +22,7 @@ setup_env() {
 setup_env
 
 # clean any random vars from the host system
-unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET
+unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET PORTDIR
 # but make sure we don't implicitly rely on user's setup
 export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
 # Always use UTC for timestamps to keep tests stable. #551806

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     68712a990b7ec0111d0f82019aed36c3ba5c11c2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 21:25:09 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 21:25:09 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=68712a99

tests: fix retrieving test name

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index c5cd8f3..7f5db06 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -35,7 +35,7 @@ q -i -q
 # used by Travis segfaults on qmanifest, so disable there to be able to
 # run the rest regularly
 dovalgrind=${Q_RUN_WITH_VALGRIND}
-[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind=
+[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
 if [[ -n ${dovalgrind} ]] ; then
 	chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
 	for f in @abs_top_builddir@/q?* ; do

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     b9051664bb3c37b2894d94cf655adfdae7862bf8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 20:47:54 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 20:47:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b9051664

tests: workound env issue on Travis

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index 8f52086..c5cd8f3 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -31,8 +31,12 @@ export TZ='UTC 0'
 # create symlinks for applets
 q -i -q
 
-# inject valgrind wrapper if necessary
-if [[ -n ${Q_RUN_WITH_VALGRIND} ]] ; then
+# inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu
+# used by Travis segfaults on qmanifest, so disable there to be able to
+# run the rest regularly
+dovalgrind=${Q_RUN_WITH_VALGRIND}
+[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind=
+if [[ -n ${dovalgrind} ]] ; then
 	chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
 	for f in @abs_top_builddir@/q?* ; do
 		[[ -L ${f} ]] || continue

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Fabian Groffen]

commit:     f45d8de0bc9d477dce9b3ae7a0d958e089307473
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 09:58:25 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 09:58:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f45d8de0

tests: allow tmpdir to reside in a place defined by Q_TMPDIR

when using NFS or something like that, using local storage iso builddir
is nice, because of speed but more because also not all operations are
allowed on network shares, so using this in some scenarios allows to
pass the tests

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 tests/init.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/init.sh.in b/tests/init.sh.in
index c031ae3..875e2af 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -68,7 +68,7 @@ end() {
 }
 
 mktmpdir() {
-	local d=${1:-${ab}/tmp}
+	local d=${1:-${Q_TMPDIR:-${ab}}/q-tmp}
 	rm -rf "$d" && \
 	mkdir -p "$d" && \
 	pushd "$d" >/dev/null \
@@ -76,7 +76,7 @@ mktmpdir() {
 }
 _cleantmpdir() {
 	local cmd=$1; shift
-	local d=${1:-${ab}/tmp}
+	local d=${1:-${Q_TMPDIR:-${ab}}/q-tmp}
 	popd >/dev/null
 	${cmd} "${d}" || fail "could not clean tmp dir '$d'"
 }

[gentoo-commits] proj/portage-utils:master commit in: tests/

[Mike Frysinger]

commit:     59e70fb5680779318d481b6883774e4e55446795
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 18:04:15 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 18:06:10 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=59e70fb5

tests: qmerge: enable tests

---
 tests/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index 8784fce..0fc448a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,6 @@
 TESTS = \
 	reinitialize atom_compare atom_explode mkdir \
-	qdepends qfile qlist qtbz2 quse qxpak \
+	qdepends qfile qlist qmerge qtbz2 quse qxpak \
 	install profile source
 
 all: check