Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

[xonotic/xonotic.git] / the-big-benchmark.sh

diff --git a/the-big-benchmark.sh b/the-big-benchmark.sh
index 253b74740ab685c290aa8bc303b0e6027cb3feb0..1744a1adc2523457ea90858c9512ce97287ea96b 100755 (executable)
--- a/the-big-benchmark.sh
+++ b/the-big-benchmark.sh
@@ -8,33 +8,36 @@ echo
 echo "WARNING: running this script will destroy ANY local changes you"
 echo "might have on the repository."
 echo
 echo "WARNING: running this script will destroy ANY local changes you"
 echo "might have on the repository."
 echo

-echo "Are you absolutely sure you want to run this?"
-echo
-while :; do
-       echo -n "y/n: "
-       read -r yesno
-       case "$yesno" in
-               y)
-                       break
-                       ;;
-               n)
-                       echo "Aborted."
-                       exit 1
-                       ;;
-       esac
-done
+if [ x"$1" != x"--yes" ]; then
+       echo "Are you absolutely sure you want to run this?"
+       echo
+       while :; do
+               echo -n "y/n: "
+               read -r yesno
+               case "$yesno" in
+                       y)
+                               break
+                               ;;
+                       n)
+                               echo "Aborted."
+                               exit 1
+                               ;;
+               esac
+       done
+fi

 
 set -x
 
 set -x

+rm -f data/benchmark.log

 ./all clean --reclone
 ./all compile -r
 ./all clean --reclone
 ./all compile -r

-./all run -nohome -benchmarkruns 3 -benchmark demos/the-big-keybench.dem +//div0-stable
+USE_GDB=no ./all run "$@" -nohome -benchmarkruns 3 -benchmark demos/the-big-keybench.dem +//div0-stable || true

 ./all clean -r -f
 (
        cd darkplaces
 ./all clean -r -f
 (
        cd darkplaces

-       git checkout master || git checkout -t origin/master || exit 1
+       git checkout div0-stable-pred3d9 || git checkout -t origin/div0-stable-pred3d9 || exit 1

 )
 ./all compile -r
 )
 ./all compile -r

-./all run -nohome -benchmarkruns 3 -benchmark demos/the-big-keybench.dem +//master
+USE_GDB=no ./all run "$@" -nohome -benchmarkruns 3 -benchmark demos/the-big-keybench.dem +//div0-stable-pred3d9 || true

 ./all clean -r -f -u
 set +x
 
 ./all clean -r -f -u
 set +x
 


@@ -46,6 +49,6 @@ echo " - graphics card (which vendor, which model)"
 echo " - operating system (including whether it is 32bit or 64bit)"
 echo " - graphics driver version"
 echo " - the following info:"
 echo " - operating system (including whether it is 32bit or 64bit)"
 echo " - graphics driver version"
 echo " - the following info:"

-tail -n 6 data/benchmark.log
+cat data/benchmark.log

 echo
 echo "Thank you"
 echo
 echo "Thank you"