From 0a86152ae90e2e045bf0f80e6cafebca56328510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 17:28:46 +0200
Subject: [PATCH 01/14] Try getting coverage data out of the tests

---
 .github/workflows/c-cpp.yml |  6 ++++--
 Makefile                    | 27 +++++++++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 0b3e83d57..8774333d4 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -33,6 +33,8 @@ jobs:
     steps:
      - uses: actions/checkout@v2
      - name: make
-       run: make
+       run: make all TEST_COVERAGE=1
      - name: test
-       run: make test_offline
+       run: make test_offline TEST_COVERAGE=1
+     - name: gcov
+       run: make coverage TEST_COVERAGE=1
diff --git a/Makefile b/Makefile
index d3eca7c0a..793fa09ba 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,11 @@ else
   BUILD=./build
 endif
 
+ifdef TEST_COVERAGE
+	BUILD=./build-gcov
+	CFLAGS+=--coverage -fprofile-dir=$(realpath .) -fprofile-abs-path
+endif
+
 INC=-I. -I$(BUILD)
 DEFS=-DFLEXSPIN_BUILD
 
@@ -106,9 +111,9 @@ endif
 #check:
 #	echo YACC="$(RUNYACC)" YACCVER="$(YACCVER)" YACC_CHECK="$(YACC_CHECK)"
 
-CFLAGS = -g -Wall $(INC) $(DEFS)
-#CFLAGS = -no-pie -pg -Wall $(INC) $(DEFS)
-#CFLAGS = -g -Og -Wall -Wc++-compat -Werror $(INC) $(DEFS)
+CFLAGS += -g -Wall $(INC) $(DEFS)
+#CFLAGS += -no-pie -pg -Wall $(INC) $(DEFS)
+#CFLAGS += -g -Og -Wall -Wc++-compat -Werror $(INC) $(DEFS)
 LIBS = -lm
 RM = rm -rf
 
@@ -151,7 +156,7 @@ help:
 
 all: $(BUILD) $(PROGS)
 
-$(BUILD)/testlex$(EXT): testlex.c $(LEXOBJS)
+$(BUILD)/testlex$(EXT): $(LEXOBJS) $(BUILD)/testlex.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 $(BUILD)/spin.tab.c $(BUILD)/spin.tab.h: frontends/spin/spin.y
@@ -172,10 +177,16 @@ preproc: preprocess.c $(UTIL)
 clean:
 	$(RM) $(PROGS) $(BUILD)/* *.zip
 
-test_offline: lextest asmtest cpptest errtest p2test
+clean_profile:
+	$(RM) $(BUILD)/*.gcda $(BUILD)/*.gcov
+
+test_offline: $(BUILD) lextest asmtest cpptest errtest p2test
 test: test_offline runtest
 #test: lextest asmtest cpptest errtest runtest
 
+coverage: 
+	(cd $(BUILD); gcov testlex.c cmdline.c spin2cpp.c flexspin.c flexcc.c $(SPINSRCS))
+
 lextest: $(PROGS)
 	$(BUILD)/testlex
 
@@ -194,13 +205,13 @@ p2test: $(PROGS)
 runtest: $(PROGS)
 	(cd Test; ./runtests.sh)
 
-$(BUILD)/spin2cpp$(EXT): spin2cpp.c cmdline.c $(OBJS)
+$(BUILD)/spin2cpp$(EXT): $(BUILD)/spin2cpp.o $(BUILD)/cmdline.o $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
-$(BUILD)/flexspin$(EXT): flexspin.c cmdline.c $(OBJS)
+$(BUILD)/flexspin$(EXT): $(BUILD)/flexspin.o $(BUILD)/cmdline.o $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
-$(BUILD)/flexcc$(EXT): flexcc.c cmdline.c $(OBJS)
+$(BUILD)/flexcc$(EXT): $(BUILD)/flexcc.o $(BUILD)/cmdline.o $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 $(BUILD):

From 4be86f92115e72def88b738636b6d25face2465d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 17:32:44 +0200
Subject: [PATCH 02/14] Update OS on CI server

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 8774333d4..4afb16f5c 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: install-mingw
       run: "sudo apt-get install gcc-mingw-w64-i686"
@@ -29,7 +29,7 @@ jobs:
         name: spin2cpp-git
         path: "spin2cpp-zip/*"
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
      - uses: actions/checkout@v2
      - name: make

From aa487a875c19a22125d70dc3d5eca9596f644da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 17:42:31 +0200
Subject: [PATCH 03/14] Make tests work with non-default build directory

---
 Makefile            | 2 ++
 Test/asmtests.sh    | 2 +-
 Test/cpptests.sh    | 2 +-
 Test/errtests.sh    | 2 +-
 Test/p2bin.sh       | 2 +-
 Test/runtests.sh    | 4 ++--
 Test/runtests_bc.sh | 4 ++--
 Test/runtests_p2.sh | 4 ++--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 793fa09ba..681917db2 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,8 @@ ifdef TEST_COVERAGE
 	CFLAGS+=--coverage -fprofile-dir=$(realpath .) -fprofile-abs-path
 endif
 
+export BUILD
+
 INC=-I. -I$(BUILD)
 DEFS=-DFLEXSPIN_BUILD
 
diff --git a/Test/asmtests.sh b/Test/asmtests.sh
index 5e85dd8c4..5421759eb 100755
--- a/Test/asmtests.sh
+++ b/Test/asmtests.sh
@@ -3,7 +3,7 @@
 if [ "$1" != "" ]; then
   SPIN2CPP=$1
 else
-  SPIN2CPP=../build/spin2cpp
+  SPIN2CPP=../${BUILD:='./build'}/spin2cpp
 fi
 
 PROG="$SPIN2CPP -I../Lib"
diff --git a/Test/cpptests.sh b/Test/cpptests.sh
index ce81c3c9f..165dd7ff4 100755
--- a/Test/cpptests.sh
+++ b/Test/cpptests.sh
@@ -3,7 +3,7 @@
 if [ "$1" != "" ]; then
   SPIN2CPP=$1
 else
-  SPIN2CPP=../build/spin2cpp
+  SPIN2CPP=../${BUILD:='./build'}/spin2cpp
 fi
 
 PROG="$SPIN2CPP -I../Lib"
diff --git a/Test/errtests.sh b/Test/errtests.sh
index 06421d2cc..266c4b65c 100755
--- a/Test/errtests.sh
+++ b/Test/errtests.sh
@@ -3,7 +3,7 @@
 if [ "$1" != "" ]; then
   PROG=$1
 else
-  PROG=../build/spin2cpp
+  PROG=../${BUILD:='./build'}/spin2cpp
 fi
 CC=propeller-elf-gcc
 ok="ok"
diff --git a/Test/p2bin.sh b/Test/p2bin.sh
index fce123b71..0234f78b2 100755
--- a/Test/p2bin.sh
+++ b/Test/p2bin.sh
@@ -3,7 +3,7 @@
 if [ "$1" != "" ]; then
   FASTSPIN=$1
 else
-  FASTSPIN=../build/flexspin
+  FASTSPIN=../${BUILD:='./build'}/flexspin
 fi
 
 PROG="$FASTSPIN -q -2b -I../Lib"
diff --git a/Test/runtests.sh b/Test/runtests.sh
index 741e9ae26..6c3f1d426 100755
--- a/Test/runtests.sh
+++ b/Test/runtests.sh
@@ -4,8 +4,8 @@ if [ "$1" != "" ]; then
     SPIN2CPP=$1
     FASTSPIN="$1 --asm --binary --code=hub"
 else
-    SPIN2CPP=../build/spin2cpp
-    FASTSPIN="../build/flexspin -g -q"
+    SPIN2CPP=../${BUILD:='./build'}/spin2cpp
+    FASTSPIN="../${BUILD:='./build'}/flexspin -g -q"
 fi
 
 PROG_C="$SPIN2CPP -I../Lib"
diff --git a/Test/runtests_bc.sh b/Test/runtests_bc.sh
index fb5e77217..26923ca1a 100755
--- a/Test/runtests_bc.sh
+++ b/Test/runtests_bc.sh
@@ -4,8 +4,8 @@ if [ "$1" != "" ]; then
     SPIN2CPP=$1
     FASTSPIN="$1 -g -q --interp=rom"
 else
-    SPIN2CPP=../build/spin2cpp
-    FASTSPIN="../build/flexspin -g -q --interp=rom"
+    SPIN2CPP=../${BUILD:='./build'}/spin2cpp
+    FASTSPIN="../${BUILD:='./build'}/flexspin -g -q --interp=rom"
 fi
 
 PROG_ASM="$FASTSPIN -I../Lib"
diff --git a/Test/runtests_p2.sh b/Test/runtests_p2.sh
index 5a9c476ba..7c8f855e2 100755
--- a/Test/runtests_p2.sh
+++ b/Test/runtests_p2.sh
@@ -4,8 +4,8 @@ if [ "$1" != "" ]; then
     SPIN2CPP=$1
     FASTSPIN="$1 --asm --binary --code=hub"
 else
-    SPIN2CPP=../build/spin2cpp
-    FASTSPIN="../build/flexspin -2 -O2 -g -q"
+    SPIN2CPP=../${BUILD:='./build'}/spin2cpp
+    FASTSPIN="../${BUILD:='./build'}/flexspin -2 -O2 -g -q"
 fi
 
 PROG_C="$SPIN2CPP -I../Lib"

From 7c56641ad73f78eff92dc05f3bdbbb2fc35da488 Mon Sep 17 00:00:00 2001
From: Wuerfel21 <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 20:15:05 +0200
Subject: [PATCH 04/14] Add debug shell to CI

---
 .github/workflows/c-cpp.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 4afb16f5c..1a58f9e80 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -7,6 +7,12 @@ on:
   pull_request:
     branches:
       - "*"
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'     
+        required: false
+        default: false
 
 jobs:
   build:
@@ -31,6 +37,10 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
+     # Enable tmate debugging of manually-triggered workflows if the input option was provided
+     - name: Setup tmate session
+       uses: mxschmitt/action-tmate@v3
+       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
      - uses: actions/checkout@v2
      - name: make
        run: make all TEST_COVERAGE=1

From 3c2ee572e7b20ef87e8a2da8cc9d12ff12d0acc8 Mon Sep 17 00:00:00 2001
From: Wuerfel21 <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 20:23:54 +0200
Subject: [PATCH 05/14] Move debug shell after checkout

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 1a58f9e80..b7a56a065 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -37,11 +37,11 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
+     - uses: actions/checkout@v2
      # Enable tmate debugging of manually-triggered workflows if the input option was provided
      - name: Setup tmate session
        uses: mxschmitt/action-tmate@v3
        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
-     - uses: actions/checkout@v2
      - name: make
        run: make all TEST_COVERAGE=1
      - name: test

From 6d34169c54c49f1e2f3249f27519adb42bd55f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:00:34 +0200
Subject: [PATCH 06/14] Try with latest gcc

---
 .github/workflows/c-cpp.yml | 31 ++++++++++++++++++-------------
 Makefile                    |  8 +++++---
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b7a56a065..9b1213265 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -18,12 +18,12 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - name: install-mingw
+    - name: Install MinGW
       run: "sudo apt-get install gcc-mingw-w64-i686"
     - uses: actions/checkout@v2
     - name: make
       run: make zip
-    - name: succ
+    - name: Work around silly artifact uploader
       run: unzip flexptools.zip -d flexptools-zip
     - run: unzip spin2cpp.zip -d spin2cpp-zip
     - uses: actions/upload-artifact@v2.1.3
@@ -37,14 +37,19 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-     - uses: actions/checkout@v2
-     # Enable tmate debugging of manually-triggered workflows if the input option was provided
-     - name: Setup tmate session
-       uses: mxschmitt/action-tmate@v3
-       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
-     - name: make
-       run: make all TEST_COVERAGE=1
-     - name: test
-       run: make test_offline TEST_COVERAGE=1
-     - name: gcov
-       run: make coverage TEST_COVERAGE=1
+    - uses: actions/checkout@v2
+    # Enable tmate debugging of manually-triggered workflows if the input option was provided
+    - name: Setup tmate session
+      uses: mxschmitt/action-tmate@v3
+      if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
+    - name: Install non-buggy GCC/GCOV
+      run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test"
+        sudo apt-get update
+        sudp apt-get install gcc-10
+    - name: make
+      run: make all TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
+    - name: test
+      run: make test_offline TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
+    - name: gcov
+      run: make coverage TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
diff --git a/Makefile b/Makefile
index 681917db2..ca3a77f2a 100644
--- a/Makefile
+++ b/Makefile
@@ -69,15 +69,17 @@ else ifeq ($(CROSS),macosx)
   EXT=
   BUILD=./build-macosx
 else ifeq ($(OS),Windows_NT)
-  CC=gcc
+  CC?=gcc
   EXT=.exe
   BUILD=./build
 else
-  CC=gcc
+  CC?=gcc
   EXT=
   BUILD=./build
 endif
 
+CCOV?=gcov
+
 ifdef TEST_COVERAGE
 	BUILD=./build-gcov
 	CFLAGS+=--coverage -fprofile-dir=$(realpath .) -fprofile-abs-path
@@ -187,7 +189,7 @@ test: test_offline runtest
 #test: lextest asmtest cpptest errtest runtest
 
 coverage: 
-	(cd $(BUILD); gcov testlex.c cmdline.c spin2cpp.c flexspin.c flexcc.c $(SPINSRCS))
+	(cd $(BUILD); $(CCOV) testlex.c cmdline.c spin2cpp.c flexspin.c flexcc.c $(SPINSRCS))
 
 lextest: $(PROGS)
 	$(BUILD)/testlex

From f9aafca785b831ae50b99e441508c13df089ad60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:02:03 +0200
Subject: [PATCH 07/14] typo

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 9b1213265..cbd14fdf8 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -44,7 +44,7 @@ jobs:
       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
     - name: Install non-buggy GCC/GCOV
       run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test"
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
         sudp apt-get install gcc-10
     - name: make

From f63352727ba63ee185b791215aee85b6c164e59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:03:10 +0200
Subject: [PATCH 08/14] other typo

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index cbd14fdf8..ea81d4e0a 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -46,7 +46,7 @@ jobs:
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
-        sudp apt-get install gcc-10
+        sudo apt-get install gcc-10
     - name: make
       run: make all TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
     - name: test

From d2a32b92ecb8382620d32d068ed8330ec93888d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:37:47 +0200
Subject: [PATCH 09/14] Rethink this a bit

---
 .github/workflows/c-cpp.yml | 2 +-
 Makefile                    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index ea81d4e0a..b68119471 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -46,7 +46,7 @@ jobs:
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
-        sudo apt-get install gcc-10
+        sudo apt-get install gcc-11
     - name: make
       run: make all TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
     - name: test
diff --git a/Makefile b/Makefile
index ca3a77f2a..da3e7ecf1 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,11 @@ else ifeq ($(CROSS),macosx)
   CC=o64-clang -DMACOSX -O
   EXT=
   BUILD=./build-macosx
-else ifeq ($(OS),Windows_NT)
+else ifeq ($(OS),Windows_NT)	
+  ifeq ($(CC),cc)
+    # Workaround for weird windows/mingw/msys/whatever nonsense
+	CC=gcc
+  endif
   CC?=gcc
   EXT=.exe
   BUILD=./build
@@ -82,7 +86,7 @@ CCOV?=gcov
 
 ifdef TEST_COVERAGE
 	BUILD=./build-gcov
-	CFLAGS+=--coverage -fprofile-dir=$(realpath .) -fprofile-abs-path
+	CFLAGS+=--coverage -fprofile-dir=$(realpath ./$(BUILD)) -fprofile-abs-path
 endif
 
 export BUILD

From e92c1388a0d465025e0550286bc7790d505c277e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:43:33 +0200
Subject: [PATCH 10/14] oop

---
 .github/workflows/c-cpp.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b68119471..07794b681 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -48,8 +48,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install gcc-11
     - name: make
-      run: make all TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
+      run: make all TEST_COVERAGE=1 CC=gcc-11 CCOV=gcov-11
     - name: test
-      run: make test_offline TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
+      run: make test_offline TEST_COVERAGE=1 CC=gcc-11 CCOV=gcov-11
     - name: gcov
-      run: make coverage TEST_COVERAGE=1 CC=gcc-10 CCOV=gcov-10
+      run: make coverage TEST_COVERAGE=1 CC=gcc-11 CCOV=gcov-11

From dcd54a94c70d48b0097b92ad695d04538199a6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:49:23 +0200
Subject: [PATCH 11/14] Fine, use GCC 8

---
 .github/workflows/c-cpp.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 07794b681..cd55f7dcd 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -43,13 +43,10 @@ jobs:
       uses: mxschmitt/action-tmate@v3
       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
     - name: Install non-buggy GCC/GCOV
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get install gcc-11
+      run: "sudo apt-get install gcc-8"
     - name: make
-      run: make all TEST_COVERAGE=1 CC=gcc-11 CCOV=gcov-11
+      run: make all TEST_COVERAGE=1 CC=gcc-8 CCOV=gcov-8
     - name: test
-      run: make test_offline TEST_COVERAGE=1 CC=gcc-11 CCOV=gcov-11
+      run: make test_offline TEST_COVERAGE=1 CC=gcc-8 CCOV=gcov-8
     - name: gcov
-      run: make coverage TEST_COVERAGE=1 CC=gcc-11 CCOV=gcov-11
+      run: make coverage TEST_COVERAGE=1 CC=gcc-8 CCOV=gcov-8

From 3be690dc182c6171e217feaf31968f222ba29fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:52:22 +0200
Subject: [PATCH 12/14] Change this back...

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index da3e7ecf1..b50ea8640 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ CCOV?=gcov
 
 ifdef TEST_COVERAGE
 	BUILD=./build-gcov
-	CFLAGS+=--coverage -fprofile-dir=$(realpath ./$(BUILD)) -fprofile-abs-path
+	CFLAGS+=--coverage -fprofile-dir=$(realpath .) -fprofile-abs-path
 endif
 
 export BUILD

From 73c221a51fdebe12dc233319bb644304838cfe5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 21:59:45 +0200
Subject: [PATCH 13/14] Add codecov upload

---
 .github/workflows/c-cpp.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index cd55f7dcd..bdbccf874 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -50,3 +50,5 @@ jobs:
       run: make test_offline TEST_COVERAGE=1 CC=gcc-8 CCOV=gcov-8
     - name: gcov
       run: make coverage TEST_COVERAGE=1 CC=gcc-8 CCOV=gcov-8
+    - name: Upload coverage
+      run: "bash <(curl -s https://codecov.io/bash)"

From 64696fa853c179e6ef97342fdb3ac73dfdc6d511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ada=20Gottenstr=C3=A4ter?= <nunuu@gmx.net>
Date: Fri, 18 Jun 2021 22:03:04 +0200
Subject: [PATCH 14/14] disable it from trying to run gcov again, but wrong

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index bdbccf874..9cbebb3f9 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -51,4 +51,4 @@ jobs:
     - name: gcov
       run: make coverage TEST_COVERAGE=1 CC=gcc-8 CCOV=gcov-8
     - name: Upload coverage
-      run: "bash <(curl -s https://codecov.io/bash)"
+      run: "bash <(curl -s https://codecov.io/bash) -X gcov"