diff --git a/configure/E3/RULES_CHECKS b/configure/E3/RULES_CHECKS index 875a02a72a62c53ba14bb05de241dbe521e8ba39..184c57c872b8f18a47aba36a45d73e1dcebe9a80 100644 --- a/configure/E3/RULES_CHECKS +++ b/configure/E3/RULES_CHECKS @@ -22,5 +22,5 @@ endif .PHONU: loc-check loc-check: ifneq (,$(findstring -loc,$(E3_MODULE_SRC_PATH))) - $(error DEPRECATED: Local source mode "-loc" has being deprecated. Please comment out the EPICS_MODULE_TAG to use local source mode.) + $(error DEPRECATED: Local source mode "-loc" has been deprecated. Please comment out the EPICS_MODULE_TAG to use local source mode.) endif diff --git a/tests/test_e3.py b/tests/test_e3.py index ed977333780dc50f6cc211ebe86c03c91d8ef197..ed73f4376f1eb50c60502954cea7768724976575 100644 --- a/tests/test_e3.py +++ b/tests/test_e3.py @@ -9,8 +9,9 @@ from .utils import run_make indirect=True, ) def test_loc(wrapper): - rc, _, _ = run_make(wrapper, "build", E3_MODULE_SRC_PATH="test-loc") + rc, _, errs = run_make(wrapper, "build", E3_MODULE_SRC_PATH="test-loc") assert rc == 2 + assert 'Local source mode "-loc" has been deprecated' in errs.decode("utf-8") def test_sitelibs(wrapper): @@ -34,5 +35,7 @@ include $(REQUIRE_CONFIG)/RULES_VARS def test_incorrect_module_name(wrapper): - rc, _, _ = run_make(wrapper, "build", E3_MODULE_NAME="ADCore") + module_name = "ADCore" + rc, _, errs = run_make(wrapper, "build", E3_MODULE_NAME=module_name) assert rc == 2 + assert f"E3_MODULE_NAME '{module_name}' is not valid" in errs.decode("utf-8")