From 31bf712059def8aae0e96921ac9839f2c9e34a8a Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 25 Mar 2026 09:41:39 +0100
Subject: [PATCH] Fix some escaping with different approach

---
 tests/fmt/generate_mk.py    | 20 ++++++++++----------
 tests/gen_tests_makefile.py |  7 ++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tests/fmt/generate_mk.py b/tests/fmt/generate_mk.py
index 04ed56c35..e4b32f9e3 100644
--- a/tests/fmt/generate_mk.py
+++ b/tests/fmt/generate_mk.py
@@ -6,11 +6,11 @@ sys.path.append("..")
 import gen_tests_makefile
 
 def cmd(lines):
-    return " ; \\\n".join(lines)
+    return " && \\\n".join(lines)
 
 def initial_display():
     gen_tests_makefile.generate_target("initial_display", cmd([
-        f"$(YOSYS) -p \"read_verilog initial_display.v\" | awk \"/<<<BEGIN>>>/,/<<<END>>>/ {{print $$0}}\" >yosys-initial_display.log 2>&1",
+        f"$(YOSYS) -p \"read_verilog initial_display.v\" | awk '/<<<BEGIN>>>/,/<<<END>>>/ {{print $$0}}' >yosys-initial_display.log 2>&1",
         "iverilog -o iverilog-initial_display initial_display.v",
         "./iverilog-initial_display >iverilog-initial_display.log",
         "diff yosys-initial_display.log iverilog-initial_display.log",
@@ -94,22 +94,22 @@ def extra():
     gen_tests_makefile.generate_target("display_lm", cmd([
         "$(YOSYS) -p \"read_verilog display_lm.v\" >yosys-display_lm.log 2>&1",
         "$(YOSYS) -p \"read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc\" >/dev/null 2>&1",
-        f"$${{CXX:-g++}} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++",
-        "./yosys-display_lm_cc >yosys-display_lm_cc.log",
-        "for log in yosys-display_lm.log yosys-display_lm_cc.log; do "
-        "grep \"^%l: \\\\bot\\$\" \"$log\" >/dev/null 2>&1; "
-        "grep \"^%m: \\\\bot\\$\" \"$log\" >/dev/null 2>&1; "
-        "done",
+        f"$${{CXX:-g++}} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ >/dev/null 2>&1",
+        "./yosys-display_lm_cc >yosys-display_lm_cc.log 2>/dev/null",
+        "grep \"^%l: \\\\\\bot\\$$\" \"yosys-display_lm.log\" >/dev/null 2>&1",
+        "grep \"^%m: \\\\\\bot\\$$\" \"yosys-display_lm.log\" >/dev/null 2>&1",
+        "grep \"^%l: \\\\\\bot\\$$\" \"yosys-display_lm_cc.log\" >/dev/null 2>&1",
+        "grep \"^%m: \\\\\\bot\\$$\" \"yosys-display_lm_cc.log\" >/dev/null 2>&1",
     ]))
 
 
 def main():
     def callback():
-        #initial_display()
+        initial_display()
         always_display()
         roundtrip()
         cxxrtl()
-        #extra()
+        extra()
 
     gen_tests_makefile.generate_custom(callback)
 
diff --git a/tests/gen_tests_makefile.py b/tests/gen_tests_makefile.py
index 969a0f41a..b81855693 100644
--- a/tests/gen_tests_makefile.py
+++ b/tests/gen_tests_makefile.py
@@ -17,12 +17,9 @@ def generate_target(name, command):
     target = f"{name}"
     print(f"all: {target}")
     print(f".PHONY: {target}")
+    print(f"{target}_cmd={command}")
     print(f"{target}:")
-    if command:
-        print(f"\t@$(call run_test,{target}, \\")
-        print(f"\t{command})")
-    else:
-        print(f"\t@$(call run_test,{target})")
+    print(f"\t@$(call run_test,{target}, $({target}_cmd))")
 
 def generate_ys_test(ys_file, yosys_args="", commands=""):
     cmd = f'$(YOSYS) -ql {ys_file}.err {yosys_args} {ys_file} >/dev/null 2>&1 && mv {ys_file}.err {ys_file}.log'