From 30c7df71d0ca565563f6c0106beb56f306948cb6 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 30 May 2022 14:58:03 +0200
Subject: [PATCH] Removed $MODULE_VERSION from patch dir
---
configure/E3/DEFINES_FT | 4 ++--
tests/test_build.py | 23 +++++++++++------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT
index b88cb9c4..62d39e5d 100644
--- a/configure/E3/DEFINES_FT
+++ b/configure/E3/DEFINES_FT
@@ -13,7 +13,7 @@ git submodule update --remote --merge $@/
endef
define patch_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)/*.p0.patch 2> /dev/null); \
+patches=$$(ls $(TOP)/patch/Site/*.p0.patch 2> /dev/null); \
if [ -n "$$patches" ]; then \
for i in $$patches; do \
printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
@@ -25,7 +25,7 @@ fi
endef
define patch_revert_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)/*.p0.patch 2> /dev/null); \
+patches=$$(ls $(TOP)/patch/Site/*.p0.patch 2> /dev/null); \
if [ -n "$$patches" ]; then \
for i in $$patches; do\
printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
diff --git a/tests/test_build.py b/tests/test_build.py
index f3f4022a..eb3386e6 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -36,18 +36,8 @@ def test_patch(wrapper):
f.write(db_file_contents)
patch_dir = wrapper.path / "patch" / "Site"
- create_patch_file(patch_dir / MODULE_VERSION / "apply.p0.patch", "OK")
- create_patch_file(
- patch_dir / MODULE_VERSION_NO_BUILD / "dont-apply.p0.patch", "Bad"
- )
- create_patch_file(patch_dir / (MODULE_VERSION + "-dont-apply.p0.patch"), "Bad")
-
- rc, outs, _ = wrapper.run_make(
- "init",
- module_version=MODULE_VERSION,
- )
- assert rc == 0
- assert "You are in the local source mode" in outs
+ create_patch_file(patch_dir / "apply.p0.patch", "OK")
+ create_patch_file(patch_dir / MODULE_VERSION / "do-not-apply.p0.patch", "Bad")
rc, _, _ = wrapper.run_make("patch", module_version=MODULE_VERSION)
assert rc == 0
@@ -65,6 +55,15 @@ def test_patch(wrapper):
assert any((wrapper.path / "cellMods").glob("**/*.db"))
+def test_local_module(wrapper):
+ rc, outs, _ = wrapper.run_make(
+ "init",
+ module_version=MODULE_VERSION,
+ )
+ assert rc == 0
+ assert "You are in the local source mode" in outs
+
+
def test_missing_dbd_file(wrapper):
wrapper.add_var_to_makefile("DBDS", "nonexistent.dbd")
rc, _, errs = wrapper.run_make("build")
--
GitLab