summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2020-03-12 20:46:58 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2020-03-13 20:34:20 +0100
commit3bd28e4fe5b288b50c8b3182a507567d2ca3c5d5 (patch)
tree449c618bc4b542140e8a4fdc8012c0d5875e7845
parentfa858e9711ed63edbc13871fb7c156f7cd576fa2 (diff)
downloadgnutls-tmp-lgtm.tar.gz
bootstrap.conf: do not bring tests in gnulib clones (src/unistring)tmp-lgtm
These tests are not being run, and they can cause issues as in !1208. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--.lgtm.yml1
-rw-r--r--bootstrap.conf4
2 files changed, 3 insertions, 2 deletions
diff --git a/.lgtm.yml b/.lgtm.yml
index ab8fd39d28..8a407d4d00 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -2,6 +2,7 @@ extraction:
cpp:
configure:
command:
+ - sed -i 's/--with-tests/--without-tests/g' bootstrap.conf
- "./bootstrap --no-git --skip-po --no-bootstrap-sync --gnulib-srcdir=gnulib"
- "wget -O nettle-master.zip https://git.lysator.liu.se/nettle/nettle/-/archive/master/nettle-master.zip?foo=`date +%Y%m%d`"
- "unzip nettle-master.zip"
diff --git a/bootstrap.conf b/bootstrap.conf
index 8421fb995f..9216ab6cf3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -93,9 +93,9 @@ bootstrap_post_import_hook ()
# sed -i 's/malloc-posix//g' ${GNULIB_SRCDIR}/modules/$i
# done
- ${GNULIB_SRCDIR}/gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --macro-prefix=unistring ${unistring_modules}
+ ${GNULIB_SRCDIR}/gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --without-tests --macro-prefix=unistring ${unistring_modules}
- ${GNULIB_SRCDIR}/gnulib-tool --import --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --no-vc-files ${src_modules}
+ ${GNULIB_SRCDIR}/gnulib-tool --import --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --without-tests --no-vc-files ${src_modules}
# git -C ${GNULIB_SRCDIR} reset --hard