From b020e2ca69014a2db656097c7be7905406c60124 Mon Sep 17 00:00:00 2001
From: MrKevinWeiss <weiss.kevin604@gmail.com>
Date: Mon, 10 May 2021 12:56:03 +0200
Subject: [PATCH] util/*: Fix EXTERNAL_MODULE_DIRS breaking change

---
 tests/Makefile.tests_common                           | 7 +++----
 utils/common/Makefile.include                         | 7 -------
 utils/{common => test_helpers}/Makefile               | 0
 utils/test_helpers/Makefile.include                   | 7 +++++++
 utils/{common => test_helpers}/include/test_helpers.h | 0
 utils/{common => test_helpers}/test_helpers.c         | 0
 6 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 utils/common/Makefile.include
 rename utils/{common => test_helpers}/Makefile (100%)
 create mode 100644 utils/test_helpers/Makefile.include
 rename utils/{common => test_helpers}/include/test_helpers.h (100%)
 rename utils/{common => test_helpers}/test_helpers.c (100%)

diff --git a/tests/Makefile.tests_common b/tests/Makefile.tests_common
index 6cb5a1c6..7aaf6edb 100644
--- a/tests/Makefile.tests_common
+++ b/tests/Makefile.tests_common
@@ -25,13 +25,12 @@ DEVELHELP ?= 1
 # expose extra metadata
 CFLAGS += -DRIOT_APPLICATION=\"$(APPLICATION)\"
 
-# Add the common folder for all common test helpers
-EXTERNAL_MODULE_DIRS += $(TESTBASE)/utils/common
-EXTERNAL_MODULE_DIRS += $(TESTBASE)/utils/sc_args
-
 # All tests here _should_ use the test helpers
 USEMODULE += test_helpers
 USEMODULE += sc_args
 
+# Add the common folder for all common test helpers
+EXTERNAL_MODULE_DIRS += $(TESTBASE)/utils
+
 # include RF specific settings
 include $(TESTBASE)/dist/robotframework/Makefile.include
diff --git a/utils/common/Makefile.include b/utils/common/Makefile.include
deleted file mode 100644
index 9b16cf2e..00000000
--- a/utils/common/Makefile.include
+++ /dev/null
@@ -1,7 +0,0 @@
-# Use an immediate variable to evaluate `MAKEFILE_LIST` now
-USEMODULE_INCLUDES_common := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/include
-USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_common)
-
-ifeq ($(USE_JSON_SHELL_PARSER),1)
-  CFLAGS += -DJSON_SHELL_PARSER
-endif
diff --git a/utils/common/Makefile b/utils/test_helpers/Makefile
similarity index 100%
rename from utils/common/Makefile
rename to utils/test_helpers/Makefile
diff --git a/utils/test_helpers/Makefile.include b/utils/test_helpers/Makefile.include
new file mode 100644
index 00000000..ec46708b
--- /dev/null
+++ b/utils/test_helpers/Makefile.include
@@ -0,0 +1,7 @@
+# Use an immediate variable to evaluate `MAKEFILE_LIST` now
+USEMODULE_INCLUDES_test_helpers := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/include
+USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_test_helpers)
+
+ifeq ($(USE_JSON_SHELL_PARSER),1)
+  CFLAGS += -DJSON_SHELL_PARSER
+endif
diff --git a/utils/common/include/test_helpers.h b/utils/test_helpers/include/test_helpers.h
similarity index 100%
rename from utils/common/include/test_helpers.h
rename to utils/test_helpers/include/test_helpers.h
diff --git a/utils/common/test_helpers.c b/utils/test_helpers/test_helpers.c
similarity index 100%
rename from utils/common/test_helpers.c
rename to utils/test_helpers/test_helpers.c