From 0e4d3aa7c5592d1faf0b985e53b7fefa85982f35 Mon Sep 17 00:00:00 2001
From: mrdudz <mrdudz@users.noreply.github.com>
Date: Tue, 17 May 2022 14:30:41 +0200
Subject: [PATCH] rename the "check" target to "checkstyle". also created a new
"check" target which runs all tests, as it is common with GNU programs
---
.github/workflows/build-on-pull-request.yml | 2 +-
.github/workflows/snapshot-on-push-master.yml | 2 +-
Makefile | 23 +++++++++++++------
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
index e9176f8c4..0ba0c6a1f 100644
--- a/.github/workflows/build-on-pull-request.yml
+++ b/.github/workflows/build-on-pull-request.yml
@@ -23,7 +23,7 @@ jobs:
- name: Do some simple style checks
shell: bash
- run: make -j2 check
+ run: make -j2 checkstyle
- name: Build the tools.
shell: bash
run: make -j2 bin USER_CFLAGS=-Werror
diff --git a/.github/workflows/snapshot-on-push-master.yml b/.github/workflows/snapshot-on-push-master.yml
index 798381951..eaaa3101a 100644
--- a/.github/workflows/snapshot-on-push-master.yml
+++ b/.github/workflows/snapshot-on-push-master.yml
@@ -48,7 +48,7 @@ jobs:
- name: Do some simple style checks
shell: bash
- run: make -j2 check
+ run: make -j2 checkstyle
- name: Build the tools.
shell: bash
run: |
diff --git a/Makefile b/Makefile
index 4f57ef7cc..e8b73e86b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util check
+.PHONY: all mostlyclean clean install zip avail unavail bin lib doc html info samples test util checkstyle check
.SUFFIXES:
@@ -30,12 +30,6 @@ doc html info:
samples:
@$(MAKE) -C samples --no-print-directory $@
-test:
- @$(MAKE) -C test --no-print-directory $@
-
-check:
- @$(MAKE) -C .github/checks --no-print-directory $@
-
util:
@$(MAKE) -C util --no-print-directory $@
@@ -44,3 +38,18 @@ util:
%:
@$(MAKE) -C libsrc --no-print-directory $@
+
+# check the code style
+checkstyle:
+ @$(MAKE) -C .github/checks --no-print-directory $@
+
+# simple "test" target, only run regression tests for c64 target
+test:
+ @$(MAKE) -C test --no-print-directory $@
+
+# GNU "check" target, which runs all tests
+check:
+ @$(MAKE) -C .github/checks --no-print-directory $@
+ @$(MAKE) test
+ @$(MAKE) -C targettest platforms --no-print-directory
+ @$(MAKE) -C samples platforms --no-print-directory