fix RELEASE file parsing - fixes #228

src/ibek/support_cmds/checks.py

@@ -15,7 +15,7 @@
 SHELL_REPLACE = r"${\1}"
 
 # find macros, including ones with blank values
-PARSE_MACROS_NULL = re.compile(r"^([A-Z_a-z0-9]*)\s*=(.*)$", flags=re.M)
+PARSE_MACROS_NULL = re.compile(r"^([A-Z_\-\.a-z0-9]*)\s*=(.*)$", flags=re.M)
 
 
 def verify_release_includes_local(configure_folder: Path):

tests/samples/epics/support/configure/RELEASE

@@ -9,4 +9,5 @@ SUPPORT=/epics/support
 EPICS_BASE=/epics/epics-base
 
 # Additional Support Modules for individual IOCs will be added below this line
-ADSIMDETECTOR=/epics/support/ADSimDetector
+ADSIMDETECTOR=/epics/support/ADSimDetector
+SOME-OTHER-MODULE=/epics/support/some-other-module

tests/test_support.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from ibek.support_cmds.checks import check_deps
+from ibek.support_cmds.checks import check_deps, do_dependencies
 from ibek.support_cmds.files import symlink_files
 
 
@@ -38,8 +38,27 @@ def test_symlink_pvi(tmp_path: Path, samples: Path):
 # the support files
 def test_check_dependencies(tmp_epics_root: Path):
     # Check Passes vs test data
-    check_deps(["ADSimDetector"])
+    check_deps(["ADSimDetector", "some-other-module"])
 
     # Check fails
     with pytest.raises(Exception):
         check_deps(["FakeDetector"])
+
+
+def test_check_release_sh(tmp_epics_root: Path):
+    """validate generation of RELEASE.sh for issue #227"""
+
+    do_dependencies()
+
+    release_sh = tmp_epics_root / "support" / "configure" / "RELEASE.shell"
+    assert release_sh.exists()
+    text = release_sh.read_text()
+    assert (
+        text
+        == """export SUPPORT="/epics/support"
+export EPICS_BASE="/epics/epics-base"
+export ADSIMDETECTOR="/epics/support/ADSimDetector"
+export SOME-OTHER-MODULE="/epics/support/some-other-module"
+export EPICS_DB_INCLUDE_PATH=""
+"""
+    )