From 55da864e0a6f5b80190ac654118d69a13239c8bb Mon Sep 17 00:00:00 2001
From: David Rheinsberg <david.rheinsberg@gmail.com>
Date: Fri, 29 May 2020 11:22:04 +0200
Subject: [PATCH] build: align makefile targets with test-targets

Align the makefile targets with the test-targets (`module` -> `mod`,
etc.). This way, we have consistent names everywhere.

While at it, move the `make test-run` invocation closer to the others.
---
 .github/workflows/runtime-tests.yml | 11 -----------
 .github/workflows/tests.yml         | 13 ++++++++++++-
 Makefile                            |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/runtime-tests.yml b/.github/workflows/runtime-tests.yml
index eb80de7b..c4263752 100644
--- a/.github/workflows/runtime-tests.yml
+++ b/.github/workflows/runtime-tests.yml
@@ -11,17 +11,6 @@ env:
   PYTHONUNBUFFERED: 1
 
 jobs:
-  runtime_tests:
-    name: "Runtime Pipeline Execution Tests"
-    runs-on: ubuntu-latest
-    steps:
-    - name: "Clone Repository"
-      uses: actions/checkout@v2
-    - name: "Run Pipeline Tests"
-      uses: osbuild/containers/ghci/actions/ghci-osbuild@ghci/v1
-      with:
-        run: make test-runtime
-
   assembler_tests:
     name: "Assembler Tests"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d91ad5ae..1a42b46c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -23,7 +23,18 @@ jobs:
     - name: "Run Module Unittests"
       uses: osbuild/containers/ghci/actions/ghci-osbuild@ghci/v1
       with:
-        run: make test-module
+        run: make test-mod
+
+  runtime_tests:
+    name: "Runtime Pipeline Execution Tests"
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Clone Repository"
+      uses: actions/checkout@v2
+    - name: "Run Pipeline Tests"
+      uses: osbuild/containers/ghci/actions/ghci-osbuild@ghci/v1
+      with:
+        run: make test-run
 
   documentation:
     name: "📚 Documentation"
diff --git a/Makefile b/Makefile
index e49877f9..fcc53172 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ $(SRCDIR)/test/data/manifests/fedora-boot.json: $(SRCDIR)/test/data/manifests/f3
 test-data: $(TEST_MANIFESTS_GEN)
 
 .PHONY: test-units
-test-module:
+test-mod:
 	@$(PYTHON3) -m unittest \
 		discover \
 			--start=$(SRCDIR)/test/mod \
@@ -140,7 +140,7 @@ test-module:
 			-v
 
 .PHONY: test-runtime
-test-runtime:
+test-run:
 	@[[ $${EUID} -eq 0 ]] || (echo "Error: Root privileges required!"; exit 1)
 	@$(PYTHON3) -m unittest \
 		discover \