fixes/gcclocal/vcs_diff_scripts.patch results

File details

./fixes/gcclocal/vcs_diff_scripts.patch 2025-10-24-05:04

Used binaries

Binaries version

> uname -a
Linux ServeurCuves 6.8.0-78-generic #78-Ubuntu SMP PREEMPT_DYNAMIC Tue Aug 12 11:34:18 UTC 2025 x86_64 x86_64 x86_64 GNU/Linux

Full file content

 
diff --git a/scripts/compare-qemu-versions.sh b/scripts/compare-qemu-versions.sh
index c971ed0..e47d5e5 100755
--- a/scripts/compare-qemu-versions.sh
+++ b/scripts/compare-qemu-versions.sh
@@ -15,15 +15,21 @@ function show_usage ()
   echo "Script $0 [--list-only] [CPU] "
   echo "is used to compare different qemu versions"
   echo "by using them as emulators for Free Pascal testsuite results"
-  echo "  --list-only : only list the different available qemu versions"
+  echo "  --upload: pass --upload optino to run-cross-tests-using-qemu.sh"
+  echo "  --list-only: only list the different available qemu versions"
   echo "CPU use qemu-user emulator for this CPU, defaults to native CPU"
   exit 1
 }
 
+run_cross_tests_using_qemu_opt=""
+
 while [ -n "{$1:-}" ] ; do
   opt="$1"
   if [ "$opt" == "--help" ] ; then
     show_usage
+  elif [ "$opt" == "--upload" ] ; then
+    run_cross_tests_using_qemu_opt+=" --upload"
+    shift
   elif [ "$opt" == "--list-only" ] ; then
     list_only=1
     shift
@@ -123,9 +129,10 @@ GLOGDIR=$SCRIPT_HOME/logs/$BRANCH/qemu-tests
 for qemu_bin in ${qemu_list//:/ } ; do
   export PATH="`dirname $qemu_bin`:$STORE_PATH"
   export QEMU_VERSION=`$qemu_bin --version 2> /dev/null | sed -n "s:.*version \([0-9.]*\).*:\1:p" `
-  echo "Running run-cross-tests-using-qemu.sh $CPU_TARGET with $qemu_bin, version $QEMU_VERSION"
+  export QEMU_TEST_COMMENT="Test with qemu version $QEMU_VERSION"
+  echo "Running run-cross-tests-using-qemu.sh $run_cross_tests_using_qemu_opt $CPU_TARGET with $qemu_bin, version $QEMU_VERSION"
   if [ $list_only -eq 1 ] ; then
-    echo "run-cross-tests-using-qemu.sh $CPU_TARGET"
+    echo "run-cross-tests-using-qemu.sh $run_cross_tests_using_qemu_opt $CPU_TARGET"
     LOGDIR="$GLOGDIR/${CPU_TARGET}-${OS_TARGET}-${QEMU_VERSION}"
     if [ ! -d "$LOGDIR" ] ; then
       LOGDIR="$GLOGDIR/${QEMU_VERSION}/${CPU_TARGET}-${OS_TARGET}"
@@ -134,7 +141,7 @@ for qemu_bin in ${qemu_list//:/ } ; do
     let run_count++
   else
     export QEMU_BIN="$qemu_bin"
-    source run-cross-tests-using-qemu.sh QEMU_LOGDIR_SUFFIX="-${QEMU_VERSION}" $CPU_TARGET
+    source run-cross-tests-using-qemu.sh $run_cross_tests_using_qemu_opt QEMU_LOGDIR_SUFFIX="-${QEMU_VERSION}" $CPU_TARGET
     LOGDIR_LIST+=" $LOGDIR"
     let run_count++
   fi
diff --git a/scripts/run-cross-tests-using-qemu.sh b/scripts/run-cross-tests-using-qemu.sh
index 568bbe3..ec9213f 100755
--- a/scripts/run-cross-tests-using-qemu.sh
+++ b/scripts/run-cross-tests-using-qemu.sh
@@ -1238,6 +1238,9 @@ if [ $fullres -eq 0 ] ; then
         TEST_COMMENT+=" $opt"
       fi
     done
+    if [ -n "${QEMU_TEST_COMMENT:-}" ] ; then
+      TEST_COMMENT="$QEMU_TEST_COMMENT $TEST_COMMENT"
+    fi
     $MAKE uploadrun TEST_FPC=$TARGET_FPC TEST_OS_TARGET="$OS_TARGET" TEST_CPU_TARGET="$CPU_TARGET" \
       TEST_BINUTILSPREFIX=${FULL_TARGET}- EMULATOR="$QEMU_SCRIPT" TEST_OPT="$TEST_OPT" \
       TEST_COMMENT="$TEST_COMMENT" $MAKE_GIT_INFO > $UPLOADFILE 2>&1