Updates to reduce set of locally made builds

In pull-buildtest and remake-mergebuilds, update the set
of builds we run locally:
 * remove old commented-out lines
 * don't build tci or notcg
 * don't do a python 2 build any more

Also consistently use V=1 everywhere.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

2 files changed, 12 insertions, 30 deletions

diff --git a/pull-buildtest b/pull-buildtest
index 5fed2b4..760cf1c 100755
--- a/pull-buildtest
+++ b/pull-buildtest
@@ -24,26 +24,18 @@ export GCC_COLORS=
 unset LD_PRELOAD
 
 # test one build from clean, at least:
-make --output-sync -C build/alldbg clean
-make --output-sync -C build/all $JFLAG
-make --output-sync -C build/alldbg $JFLAG
-# Now done on a different host using mxe cross toolchain
-#make --output-sync -C build/w32-new $JFLAG
-#make --output-sync -C build/w64-new $JFLAG
-make --output-sync -C build/clang $JFLAG
-make --output-sync -C build/tci $JFLAG
-make --output-sync -C build/notcg $JFLAG
-make --output-sync -C build/all-linux-static $JFLAG
+make --output-sync -C build/alldbg clean V=1
+
+make --output-sync -C build/all V=1 $JFLAG
+make --output-sync -C build/alldbg V=1 $JFLAG
+make --output-sync -C build/clang V=1 $JFLAG
+make --output-sync -C build/all-linux-static V=1 $JFLAG
+
 make --output-sync -C build/all check V=1 $JFLAG
 make --output-sync -C build/alldbg check V=1 $JFLAG
 make --output-sync -C build/clang check V=1 $JFLAG
-# tci doesn't pass tests...
-#make --output-sync -C build/tci check $JFLAG
-# Disable for the moment: tests won't pass if KVM won't run
-# (eg because virtualbox is running)
-#make --output-sync -C build/notcg check $JFLAG
 make --output-sync -C build/all-linux-static check V=1 $JFLAG
 make --output-sync -C ~/linaro/linux-user-test-0.3/ test
 # Run linux-user tests via docker
-make --output-sync -C build/all-linux-static check-tcg
+make --output-sync -C build/all-linux-static V=1 check-tcg
 echo "OK DONE x86"
diff --git a/remake-merge-builds b/remake-merge-builds
index f87def0..04033a4 100755
--- a/remake-merge-builds
+++ b/remake-merge-builds
@@ -23,23 +23,13 @@ do_conf() {
 
 # we must disable gnutls support as its pkg-config has link options that don't work for static build
 do_conf all-linux-static '--cc=ccache gcc' '--enable-debug' '--static' '--disable-system' --disable-gnutls
-do_conf all '--cc=ccache gcc' '--python=python2'
+do_conf all '--cc=ccache gcc'
 do_conf alldbg '--cc=ccache gcc' '--enable-debug' '--python=python3'
 # We have to disable shift-base sanitizer warnings because older
 # versions of clang don't realize that -fwrapv means shifts into the sign bit, etc are
 # defined behaviour. https://bugs.llvm.org/show_bug.cgi?id=25552
 do_conf clang '--cc=clang' '--cxx=clang++' '--enable-gtk' '--extra-cflags=-fsanitize=undefined  -fno-sanitize=shift-base -Werror'
 
-do_conf tci '--enable-debug' '--enable-tcg-interpreter' '--cc=ccache gcc'
-
-do_conf notcg '--cc=ccache gcc' '--enable-debug' '--disable-tcg'
-
-# -Wno-unused-local-typedefs is working around a problem with the glib version this
-# toolchain is using where newer gcc gave a warning about its assert macro. Fixed
-# in later glib but I don't care to go through the process of sorting out the libs again.
-# TODO could we use --enable-werror rather than -Werror with these compilers ?
-# These have been moved to another machine
-#do_conf w32-new '--cross-prefix=i686-w64-mingw32-' '--extra-cflags=-I/home/petmay01/linaro/mingw/include -Werror -Wno-unused-local-typedefs' '--extra-ldflags=-L/home/petmay01/linaro/mingw/lib'
-
-# Similar remarks apply here.
-#do_conf w64-new '--cross-prefix=x86_64-w64-mingw32-' '--extra-cflags=-I/home/petmay01/linaro/mingw64/include -Werror -Wno-unused-local-typedefs' '--extra-ldflags=-L/home/petmay01/linaro/mingw64/lib' '--enable-debug'
+# tci and notcg are now covered by gitlab
+#do_conf tci '--enable-debug' '--enable-tcg-interpreter' '--cc=ccache gcc'
+#do_conf notcg '--cc=ccache gcc' '--enable-debug' '--disable-tcg'