[CR] Test order randomization using a focused set of tests

.github/workflows/matrix.yml

@@ -34,43 +34,28 @@ on:
 jobs:
   varied_builds:
     strategy:
+      max-parallel: 3
       matrix:
         include:
-          - compiler: g++-9
-            os: ubuntu-latest
+          - compiler: clang++
+            os: macos-10.15
             cmake: 0
-            tiles: 0
-            test-stage: 1
-            native: linux64
-            gold: 1
-            lto: 1
-            title: GCC 9, Ubuntu, Curses, LTO
+            tiles: 1
+            native: osx
+            title: Clang 12, macOS 10.15, Tiles
           - compiler: g++-7
             os: ubuntu-latest
             cmake: 1
             tiles: 1
             native: linux64
-            title: GCC 7, Ubuntu, Tiles, CMake
-          - compiler: g++-8
-            os: ubuntu-latest
-            cmake: 0
-            tiles: 1
-            sanitize: address
-            native: linux64
-            title: GCC 8, Ubuntu, Tiles, ASan
-          - compiler: clang++-9
+            title: GCC 7, Ubuntu, CMake, Tiles
+          - compiler: g++-9
             os: ubuntu-latest
             cmake: 0
-            tiles: 1
-            sanitize: address,undefined
+            tiles: 0
+            test-stage: 1
             native: linux64
-            title: Clang 9, Ubuntu, Tiles, ASan, UBSan
-          - compiler: clang++
-            os: macos-10.15
-            cmake: 0
-            tiles: 1
-            native: osx
-            title: Clang 12, macOS 10.15, Tiles
+            title: GCC 9, Ubuntu, Curses
     name: ${{ matrix.title }}
     runs-on: ${{ matrix.os }}
     env:
@@ -100,7 +85,7 @@ jobs:
     - name: install dependencies (mac)
       if: runner.os == 'macOS'
       run: |
-          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel coreutils
     - name: prepare
       run: bash ./build-scripts/requirements.sh
     - name: Get Date

.travis.yml

@@ -55,7 +55,7 @@ branches:
 jobs:
   include:
     # Initial test stage, if this fails everything else is canceled.
-    - stage: Test
+    - stage: Test plus platforms
       # Clang is consistently the fastest to build, so use it for the initial test.
       env: CLANG=clang++-3.8 TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
       name: "Clang 3.8 Make build with curses and style check"
@@ -65,6 +65,21 @@ jobs:
           packages: ["clang-3.8"]
           sources: [*apt_sources]
 
+    # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
+    - env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" TILES=1 SOUND=1
+      name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound"
+      compiler: gcc
+      addons: &gcc
+        apt:
+          packages: ["wine"]
+
+    - env: CLANG=clang++ OSX_MIN=10.13 TILES=1 SOUND=1
+      name: "Xcode 10.2 Make build with Tiles and sound (macOS)"
+      os: osx
+      osx_image: xcode10.2
+      compiler: clang
+
+
     # Then build different configurations and targets in parallel.
     - stage: "Main Compilers"
       env: COMPILER=g++ MODS=--mods=magiclysm LOCALIZE=0
@@ -96,17 +111,10 @@ jobs:
             - sourceline: "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main"
               key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
-    - stage: "Platforms and Tidy"
-    # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
-      env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" TILES=1 SOUND=1
-      name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound"
-      compiler: gcc
-      addons: &gcc
-        apt:
-          packages: ["wine"]
-
-    - env: NATIVE=android COMPILER=gcc
+    - stage: "Platforms"
+      env: NATIVE=android COMPILER=gcc
       name: "Android build"
+      if: type != pull_request
       language: android
       android:
         components:
@@ -118,12 +126,6 @@ jobs:
         directories:
           - $HOME/.ccache
 
-    - env: CLANG=clang++ OSX_MIN=10.13 TILES=1 SOUND=1
-      name: "Xcode 10.2 Make build with Tiles and sound (macOS)"
-      os: osx
-      osx_image: xcode10.2
-      compiler: clang
-
     # Finally check the compiler variants
     - stage: compilers
       # GCC 5.4 is default on Xenial

build-scripts/build.sh

@@ -77,7 +77,7 @@ then
 
     if [ "$COMPILER" = "clang++-8" -a -n "$GITHUB_WORKFLOW" -a -n "$CATA_CLANG_TIDY" ]
     then
-        # This is a hacky workaround for the fact that the custom clang-tidy we are
+        # This is a hacky workaround for that the custom clang-tidy we are
         # using is built for Travis CI, so it's not using the correct include directories
         # for GitHub workflows.
         cmake_extra_opts+=("-DCMAKE_CXX_FLAGS=-isystem /usr/include/clang/8.0.0/include")
@@ -132,7 +132,7 @@ then
         set +x
         all_cpp_files="$( \
             grep '"file": "' build/compile_commands.json | \
-            sed "s+.*$PWD/++;s+\"$++")"
+            sed "s+.*$PWD/++;s+\"$++")" # ' (This is for editor formatting)
         changed_cpp_files="$( \
             ./build-scripts/files_changed | grep -F "$all_cpp_files" || true )"
         if [ -n "$changed_cpp_files" ]
@@ -165,8 +165,9 @@ then
         make -j$num_jobs
         cd ..
         # Run regular tests
-        [ -f "${bin_path}cata_test" ] && parallel --verbose --linebuffer "run_test $(printf %q "${bin_path}")'/cata_test' {} '('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
-        [ -f "${bin_path}cata_test-tiles" ] && parallel --verbose --linebuffer "run_test $(printf %q "${bin_path}")'/cata_test-tiles' {} '('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+	seed="$(shuf -i 0-1000000000 -n 1)"
+        [ -f "${bin_path}cata_test" ] && parallel --verbose --tagstring "({1} {2})=>" --linebuffer $WINE ${bin_path}/cata_test --durations yes --use-colour yes --rng-seed $seed $EXTRA_TEST_OPTS {1} {2} ::: "--order decl" "--order rand" ::: "--success [weary]" "-f weary_nutrition_tests.txt"
+        [ -f "${bin_path}cata_test-tiles" ] && parallel --verbose --tagstring "({})=>" --linebuffer $WINE ${bin_path}/cata_test-tiles --durations yes --use-colour yes --rng-seed $seed $EXTRA_TEST_OPTS {1} {2} ::: "--order decl" "--order rand" ::: "--success [weary]" "-f weary_nutrition_tests.txt"
     fi
 elif [ "$NATIVE" == "android" ]
 then
@@ -187,10 +188,11 @@ else
 
     export ASAN_OPTIONS=detect_odr_violation=1
     export UBSAN_OPTIONS=print_stacktrace=1
-    parallel --verbose --linebuffer "run_test './tests/cata_test' {} '('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+    seed="$(shuf -i 0-1000000000 -n 1)"
+    parallel --verbose --tagstring "({1} {2})=>" --linebuffer $WINE ./tests/cata_test --durations yes --use-colour yes --rng-seed $seed $EXTRA_TEST_OPTS {1} {2} ::: "--order decl" "--order rand" ::: "--success [weary]" "-f weary_nutrition_tests.txt"
     if [ -n "$MODS" ]
     then
-        parallel --verbose --linebuffer "run_test './tests/cata_test --user-dir=modded '$(printf %q "${MODS}") {} 'Mods-('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+        parallel --verbose --tagstring "(Mods {1} {2})=>" --linebuffer $WINE ./tests/cata_test --user-dir=modded $MODS --durations yes --use-colour yes --rng-seed $seed $EXTRA_TEST_OPTS {1} {2} ::: "--order decl" "--order rand" ::: "--success [weary]" "-f weary_nutrition_tests.txt"
     fi
 
     if [ -n "$TEST_STAGE" ]

src/activity_tracker.cpp

@@ -4,6 +4,7 @@
 #include "options.h"
 #include "string_formatter.h"
 
+#include <cmath>
 #include <limits>
 
 int activity_tracker::weariness() const
@@ -28,22 +29,23 @@ void activity_tracker::try_reduce_weariness( int bmr, bool sleeping )
 
     const float recovery_mult = get_option<float>( "WEARY_RECOVERY_MULT" );
 
-    if( low_activity_ticks >= 6 ) {
+    if( low_activity_ticks >= 1 ) {
         int reduction = tracker;
-        // 1/20 of whichever's bigger
+        // 1/120 of whichever's bigger
         if( bmr > reduction ) {
-            reduction = bmr * recovery_mult;
+            reduction = std::floor( bmr * recovery_mult * low_activity_ticks / 6.0f );
         } else {
-            reduction *= recovery_mult;
+            reduction = std::ceil( reduction * recovery_mult * low_activity_ticks / 6.0f );
         }
-        low_activity_ticks -= 6;
+        low_activity_ticks = 0;
 
-        tracker -= reduction;
+        tracker -= std::max( reduction, 1 );
     }
 
-    if( tick_counter >= 12 ) {
-        intake *= 1 - recovery_mult;
-        tick_counter -= 12;
+    // If happens to be no reduction, character is not (as) hypoglycemic
+    if( tick_counter >= 3 ) {
+        intake *= std::pow( 1 - recovery_mult, 0.25f );
+        tick_counter -= 3;
     }
 
     // Normalize values, make sure we stay above 0

src/activity_tracker.h

@@ -18,14 +18,14 @@ class activity_tracker
         bool activity_reset = true;
         int num_events = 1;
 
+    public:
         // Weariness metadata.
         int tracker = 0;
         int intake = 0;
         // Semi-consecutive 5 minute ticks of low activity (or 2.5 if we're sleeping).
         int low_activity_ticks = 0;
         // How many ticks since we've decreased intake.
         int tick_counter = 0;
-    public:
         // Logs activity level. If called multiple times in one turn, will preserve the highest.
         void log_activity( float new_level );
         // Informs the tracker that a new turn has started.