tests_rv: Fixes for the build/boot scripts

Some fixes:
 - Use "-z none" when possible. This reduces the buildtime
 - Formatting: Remove tabs
 - Warnings/error are printed to stdout, not stderr, so let us use
   stdout.
 - allmodconfig is simply too slow -- use defconfig until ccache
   works.

Signed-off-by: Björn Töpel <[email protected]>

Author: bjorn-rivos

tests_rv/patch/build_allmod_rv64_clang/build_allmod_rv64_clang.sh

@@ -7,9 +7,9 @@ tmpdir=$(mktemp -d)
 rc=0
 
 tuxmake --wrapper ccache --target-arch riscv --runtime podman --directory . \
-	--environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
-	--environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
-	-o $tmpdir --toolchain llvm-nightly allmodconfig || rc=1
+        --environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
+        --environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
+        -o $tmpdir --toolchain llvm-nightly -z none allmodconfig || rc=1
 
 if [ $rc -ne 0 ]; then
   echo "Build failed" >&$DESC_FD

tests_rv/patch/build_boot_rv64/build_boot_rv64.sh

@@ -7,16 +7,20 @@ tmpdir=$(mktemp -d)
 rc=0
 
 tuxmake --wrapper ccache --target-arch riscv --runtime podman --directory . \
-	--environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
-	--environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
-	-o $tmpdir --toolchain gcc-11 || rc=1
+        --environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
+        --environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
+        -o $tmpdir --toolchain gcc-11 || rc=1
+
+# FIXME: Add -z none to tuxmake (reduce build time), but tuxrun bailes out. :-( 
 
 if [ $rc -ne 0 ]; then
   echo "Build failed" >&$DESC_FD
 else
-  tuxrun --device qemu-riscv64 --tuxmake $tmpdir --runtime podman || rc=1
+  tuxrun --device qemu-riscv64 --tuxmake $tmpdir --runtime podmap || rc=1
   if [ $rc -ne 0 ]; then
     echo "Boot/poweroff failed" >&$DESC_FD
+  else
+    echo "Build and boot/poweroff OK" >&$DESC_FD
   fi
 fi
 

tests_rv/patch/build_boot_rv64_clang/build_boot_rv64_clang.sh

@@ -7,16 +7,20 @@ tmpdir=$(mktemp -d)
 rc=0
 
 tuxmake --wrapper ccache --target-arch riscv --runtime podman --directory . \
-	--environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
-	--environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
-	-o $tmpdir --toolchain llvm-nightly || rc=1
+        --environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
+        --environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
+        -o $tmpdir --toolchain llvm-nightly || rc=1
+
+# FIXME: Add -z none to tuxmake (reduce build time), but tuxrun bailes out. :-( 
 
 if [ $rc -ne 0 ]; then
   echo "Build failed" >&$DESC_FD
 else
-  tuxrun --device qemu-riscv64 --tuxmake $tmpdir --runtime podman || rc=1
+  tuxrun --device qemu-riscv64 --tuxmake $tmpdir --runtime docker || rc=1
   if [ $rc -ne 0 ]; then
     echo "Boot/poweroff failed" >&$DESC_FD
+  else
+    echo "Build and boot/poweroff OK" >&$DESC_FD
   fi
 fi
 

tests_rv/patch/build_warn_rv64/build_warn_rv64.sh

@@ -23,31 +23,33 @@ git log -1 --pretty='%h ("%s")' HEAD~
 
 echo "Baseline building the tree"
 
+# FIXME: Build allmodconfig. For some reason ccache is not working for allmodconfig
+
 tuxmake --wrapper ccache --target-arch riscv --runtime podman --directory . \
-	--environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
-	--environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
-	-o $tmpdir0 --toolchain gcc-11 --kconfig allmodconfig -K CONFIG_WERROR=n W=1
+        --environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
+        --environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
+        -o $tmpdir0 --toolchain gcc-11 -z none --kconfig defconfig -K CONFIG_WERROR=n W=1
 
 git checkout -q HEAD~
 
 echo "Building the tree before the patch"
 
 tuxmake --wrapper ccache --target-arch riscv --runtime podman --directory . \
-	--environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
-	--environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
-	-o $tmpdir1 --toolchain gcc-11 --kconfig allmodconfig -K CONFIG_WERROR=n W=1 \
-	2> >(tee $tmpfile_o >&2)
+        --environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
+        --environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
+        -o $tmpdir1 --toolchain gcc-11 -z none --kconfig defconfig -K CONFIG_WERROR=n W=1 \
+        > >(tee $tmpfile_o)
 incumbent=$(grep -i -c "\(warn\|error\)" $tmpfile_o)
 
 echo "Building the tree with the patch"
 
 git checkout -q $HEAD
 
 tuxmake --wrapper ccache --target-arch riscv --runtime podman --directory . \
-	--environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
-	--environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
-	-o $tmpdir2 --toolchain gcc-11 --kconfig allmodconfig -K CONFIG_WERROR=n W=1 \
-	2> >(tee $tmpfile_n >&2) || rc=1
+        --environment=KBUILD_BUILD_TIMESTAMP=@1621270510 \
+        --environment=KBUILD_BUILD_USER=tuxmake --environment=KBUILD_BUILD_HOST=tuxmake \
+        -o $tmpdir2 --toolchain gcc-11 -z none --kconfig defconfig -K CONFIG_WERROR=n W=1 \
+        > >(tee $tmpfile_n) || rc=1
 
 current=$(grep -i -c "\(warn\|error\)" $tmpfile_n)