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

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

[Mike Frysinger]

commit:     d088ba735ae7f787f2d75200a357924ba219e1e1
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 09:09:04 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 09:09:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d088ba73

travis: note misbehavior by coverity addon when throttled

Example here: https://travis-ci.org/libgd/libgd/builds/139971212
The last line in the log is just the throttle notice.

 travis/main.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/main.sh b/travis/main.sh
index 7831298..75daa0b 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -4,6 +4,8 @@
 
 # We have to do this by hand rather than use the coverity addon because of
 # matrix explosion: https://github.com/travis-ci/travis-ci/issues/1975
+# We also do it by hand because when we're throttled, the addon will exit
+# the build immediately and skip the main script!
 coverity_scan() {
 	local reason
 	[[ ${TRAVIS_JOB_NUMBER} != *.1 ]] && reason="not first build job"

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

[Fabian Groffen]

commit:     f261d54edff92f3e54e75d7a3349050de8d7e441
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 06:40:05 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 06:40:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f261d54e

travis: try to get some hints from sanitisers

 travis/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 75daa0b..4e8fdae 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -36,7 +36,7 @@ main() {
 
 	# Debug build w/ASAN and such enabled.
 	m debug
-	m check
+	m check LSAN_OPTIONS=verbosity=1:log_threads=1
 
 	# Do scans last as they like to dirty the tree and some tests
 	# expect a clean tree (like code style checks).

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

[Fabian Groffen]

commit:     fbc80ef1b61804e6424f304109af96b0b59bfef7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 06:47:34 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 06:47:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=fbc80ef1

travis: 2nd try to get more verbosity

 travis/main.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 4e8fdae..a076957 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -35,8 +35,10 @@ main() {
 	m check
 
 	# Debug build w/ASAN and such enabled.
+	export LSAN_OPTIONS=verbosity=1:log_threads=1
 	m debug
-	m check LSAN_OPTIONS=verbosity=1:log_threads=1
+	m check
+	unset LSAN_OPTIONS
 
 	# Do scans last as they like to dirty the tree and some tests
 	# expect a clean tree (like code style checks).

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

[Fabian Groffen]

commit:     faf2859213a171f667a1b9a31e79ee1a4216d536
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 06:54:47 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 06:54:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=faf28592

travis: disable LSan run, it requires sudo

 travis/main.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index a076957..05c71eb 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -34,11 +34,10 @@ main() {
 	m
 	m check
 
+	# LSan needs sudo, which we don't use at the moment
 	# Debug build w/ASAN and such enabled.
-	export LSAN_OPTIONS=verbosity=1:log_threads=1
-	m debug
-	m check
-	unset LSAN_OPTIONS
+	#m debug
+	#m check
 
 	# Do scans last as they like to dirty the tree and some tests
 	# expect a clean tree (like code style checks).

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

[Fabian Groffen]

commit:     bc2883499918e2f6cde31eaf17ed3c46c61d6453
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 19:08:18 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 19:08:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bc288349

travis: touch files in order not to trigger autoreconf

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

 travis/main.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/main.sh b/travis/main.sh
index bf1c01f..1cf62b9 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -30,6 +30,8 @@ main() {
 	export CPPFLAGS="-I${PWD}/../sysroot"
 	export LDFLAGS="-L${PWD}/../sysroot"
 
+	# get timestamps in order
+	v touch configure.ac Makefile.am aclocal.m4 configure Makefile.in config.h.in
 	v ./configure
 
 	# Standard optimized build.

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

[Fabian Groffen]

commit:     ea0aae92fe4e454442f2833f9e7f6bb2f5767c15
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 14:32:04 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 21 14:32:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ea0aae92

travis: fix Clang build, attempt 2 at libb2

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

 travis/install-blake2.sh | 2 +-
 travis/main.sh           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
index 1ee6f1e..36989d8 100755
--- a/travis/install-blake2.sh
+++ b/travis/install-blake2.sh
@@ -19,7 +19,7 @@ main() {
 			--libdir=/ \
 			--includedir=/
 		m
-		m DESTDIR=../../sysroot install
+		m DESTDIR="${PWD}/../../sysroot" install
 	)
 	v rm -rf libb2*
 	travis_fold end dep-blake2

diff --git a/travis/main.sh b/travis/main.sh
index cf68cc9..7749a0a 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -31,7 +31,8 @@ main() {
 	export LDFLAGS="-L${PWD}/../sysroot"
 
 	# ignore timestamps which git doesn't preserve
-	v ./configure --disable-maintainer-mode
+	# disable openmp because Clang's libomp isn't installed
+	v ./configure --disable-maintainer-mode --disable-openmp
 
 	# Standard optimized build.
 	m

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

[Fabian Groffen]

commit:     2a905aad54eb5ad13d21371b79eada5401d012ad
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 14:52:25 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 21 14:52:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2a905aad

travis: build verbose so we can see what's done

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

 travis/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 7749a0a..bfb7aae 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -35,7 +35,7 @@ main() {
 	v ./configure --disable-maintainer-mode --disable-openmp
 
 	# Standard optimized build.
-	m
+	m V=1
 	m check
 
 	# LSan needs sudo, which we don't use at the moment

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

[Fabian Groffen]

commit:     53b31a333ad3b9123b4ee5541295e6b5f00080cd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 14:55:51 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 21 14:55:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=53b31a33

travis: build blake2 without openmp to avoid trouble

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

 travis/install-blake2.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
index 36989d8..4a2bc20 100755
--- a/travis/install-blake2.sh
+++ b/travis/install-blake2.sh
@@ -15,12 +15,14 @@ main() {
 		./configure \
 			--enable-static \
 			--disable-shared \
+			--disable-openmp \
 			--prefix=/ \
 			--libdir=/ \
 			--includedir=/
 		m
 		m DESTDIR="${PWD}/../../sysroot" install
 	)
+	v rm -f ../sysroot/*.la
 	v rm -rf libb2*
 	travis_fold end dep-blake2
 }

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

[Fabian Groffen]

commit:     73577cafa452ae8df91e6fcc776bb9411ce6efc6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:46:39 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:46:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=73577caf

travis: test permutations of enabled/disabled features

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

 travis/main.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index bfb7aae..c5ce010 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -32,11 +32,21 @@ main() {
 
 	# ignore timestamps which git doesn't preserve
 	# disable openmp because Clang's libomp isn't installed
-	v ./configure --disable-maintainer-mode --disable-openmp
+	DEFARGS="--disable-maintainer-mode --disable-openmp"
 
-	# Standard optimized build.
-	m V=1
-	m check
+	do_run() {
+		v ./configure ${*}
+
+		# Standard optimized build.
+		m V=1
+		m check
+	}
+
+	do_run ${DEFARGS}
+	do_run ${DEFARGS} --enable-qmanifest --enable-qtegrity
+	do_run ${DEFARGS} --distable-qmanifest --enable-qtegrity
+	do_run ${DEFARGS} --enable-qmanifest --distable-qtegrity
+	do_run ${DEFARGS} --disable-qmanifest --distable-qtegrity
 
 	# LSan needs sudo, which we don't use at the moment
 	# Debug build w/ASAN and such enabled.

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

[Fabian Groffen]

commit:     fa4cb71cdc27c72ceb64d2f60f0ae227c1af9337
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 17:50:04 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 17:50:04 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=fa4cb71c

travis: fix typo, ensure we recompile files after configure

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

 travis/main.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index c5ce010..7154ce5 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -40,13 +40,14 @@ main() {
 		# Standard optimized build.
 		m V=1
 		m check
+		m clean
 	}
 
 	do_run ${DEFARGS}
 	do_run ${DEFARGS} --enable-qmanifest --enable-qtegrity
-	do_run ${DEFARGS} --distable-qmanifest --enable-qtegrity
-	do_run ${DEFARGS} --enable-qmanifest --distable-qtegrity
-	do_run ${DEFARGS} --disable-qmanifest --distable-qtegrity
+	do_run ${DEFARGS} --disable-qmanifest --enable-qtegrity
+	do_run ${DEFARGS} --enable-qmanifest --disable-qtegrity
+	do_run ${DEFARGS} --disable-qmanifest --disable-qtegrity
 
 	# LSan needs sudo, which we don't use at the moment
 	# Debug build w/ASAN and such enabled.

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

[Fabian Groffen]

commit:     3246fde76f7d3bd0ea03cf7913032981e62cff23
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 15:24:06 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 15:24:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3246fde7

travis: try differently to get valgrind to run

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

 travis/main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index 50f10c7..6f55073 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -50,8 +50,8 @@ main() {
 	do_run ${DEFARGS} --disable-qmanifest --disable-qtegrity
 
 	if [[ ${TRAVIS_OS_NAME} == linux ]] ; then
-		do_run CFLAGS=-g Q_RUN_WITH_VALGRIND=1 \
-			${DEFARGS} --enable-qmanifest --enable-qtegrity
+		export Q_RUN_WITH_VALGRIND=1
+		do_run CFLAGS=-g ${DEFARGS} --enable-qmanifest --enable-qtegrity
 	fi
 
 	# LSan needs sudo, which we don't use at the moment

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

[Fabian Groffen]

commit:     199e9db25a2aa7bed23d26cb7f835cf0569bd66d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 14:55:23 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 14:55:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=199e9db2

travis: fix blake2b installation for coverity or valgrind

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

 travis/install-blake2.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
index 4a2bc20..92e58ff 100755
--- a/travis/install-blake2.sh
+++ b/travis/install-blake2.sh
@@ -26,4 +26,8 @@ main() {
 	v rm -rf libb2*
 	travis_fold end dep-blake2
 }
+
+if [[ ${CC} == valgrind || ${CC} == coverity ]] ; then
+	export CC=gcc
+fi
 main "$@"

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

[Fabian Groffen]

commit:     5743951c803b852e3ff48535b1ba5cfe89a2dd8a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 15:00:23 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 15:00:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5743951c

travis: drop old coverity call

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

 travis/main.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index 52a3c90..5cbd480 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -21,9 +21,6 @@ do_run() {
 
 if [[ ${CC} == coverity ]] ; then
   [[ -n ${COVERITY_SCAN_TOKEN} ]] || exit 0;  # don't fail on this for PRs
-  # Do scans last as they like to dirty the tree and some tests
-  # expect a clean tree (like code style checks).
-  v --fold="coverity_scan" coverity_scan
   # ensure we end up with an existing compiler
   export CC=gcc
   v ./configure ${DEFARGS} --enable-qmanifest --enable-qtegrity

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

[Fabian Groffen]

commit:     71e52bce427ac05fc92e15ffd35ffe4d40c4e1a3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 15:07:12 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 15:07:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=71e52bce

travis: coverity fails with "success", so just ignore output

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

 travis/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 5cbd480..6313d1b 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -24,7 +24,7 @@ if [[ ${CC} == coverity ]] ; then
   # ensure we end up with an existing compiler
   export CC=gcc
   v ./configure ${DEFARGS} --enable-qmanifest --enable-qtegrity
-  curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash
+  curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash || true
 elif [[ ${CC} == valgrind ]] ; then
   export CC=gcc
   do_run CFLAGS=-g ${DEFARGS} --enable-qmanifest --enable-qtegrity

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

[Fabian Groffen]

commit:     1618cd3e114309e62d10e5f6cbf468a3e91b8985
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 10:47:29 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 10:47:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1618cd3e

travis: ensure we keep env-set CPPFLAGS/LDFLAGS

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

 travis/main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index 6313d1b..2c1670c 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -3,8 +3,8 @@
 . "${0%/*}"/lib.sh
 
 # For local deps like blake2b.
-export CPPFLAGS="-I${PWD}/../sysroot"
-export LDFLAGS="-L${PWD}/../sysroot"
+export CPPFLAGS="${CPPFLAGS} -I${PWD}/../sysroot"
+export LDFLAGS="${LDFLAGS} -L${PWD}/../sysroot"
 
 # ignore timestamps which git doesn't preserve
 # disable openmp because Clang's libomp isn't installed