From 2f9ca27b3f444151d0531e3ccb3f96cab1f5bc08 Mon Sep 17 00:00:00 2001 From: Liam Beguin Date: Fri, 29 Dec 2023 00:11:59 -0500 Subject: [PATCH] libero: make sure all paths use the same variable expansion Signed-off-by: Liam Beguin --- edalize/templates/libero/libero-syn-user.tcl.j2 | 6 +++--- tests/test_libero/libero-test-all-syn-user.tcl | 4 ++-- tests/test_libero/libero-test-syn-user.tcl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/edalize/templates/libero/libero-syn-user.tcl.j2 b/edalize/templates/libero/libero-syn-user.tcl.j2 index ea245efd3..885812e3d 100644 --- a/edalize/templates/libero/libero-syn-user.tcl.j2 +++ b/edalize/templates/libero/libero-syn-user.tcl.j2 @@ -3,14 +3,14 @@ # Libero {% if vlogparam -%}{%- for k,v in vlogparam.items() %} -set_option -hdl_param -set {{k}}={{v}} +set_option -hdl_param -set {{k}}={{ v|generic_value_str(bool_is_str=True) }} {% endfor -%}{%- endif %} {% if vlogdefine -%}{%- for k,v in vlogdefine.items() %} -set_option -hdl_define -set {{k}}={{v}} +set_option -hdl_define -set {{k}}={{ v|generic_value_str(bool_is_str=True) }} {% endfor -%}{%- endif %} {% if generic -%} set_option -hdl_param -set { - {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(bool_is_str = True) }} {% endfor -%} + {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(bool_is_str=True) }} {% endfor -%} } {%- endif %} diff --git a/tests/test_libero/libero-test-all-syn-user.tcl b/tests/test_libero/libero-test-all-syn-user.tcl index 1950f5166..36f43baaa 100644 --- a/tests/test_libero/libero-test-all-syn-user.tcl +++ b/tests/test_libero/libero-test-all-syn-user.tcl @@ -2,10 +2,10 @@ # Synplify Tcl Script # Libero -set_option -hdl_param -set vlogparam_bool=True +set_option -hdl_param -set vlogparam_bool=true set_option -hdl_param -set vlogparam_int=42 set_option -hdl_param -set vlogparam_str=hello -set_option -hdl_define -set vlogdefine_bool=True +set_option -hdl_define -set vlogdefine_bool=true set_option -hdl_define -set vlogdefine_int=42 set_option -hdl_define -set vlogdefine_str=hello diff --git a/tests/test_libero/libero-test-syn-user.tcl b/tests/test_libero/libero-test-syn-user.tcl index 1950f5166..36f43baaa 100644 --- a/tests/test_libero/libero-test-syn-user.tcl +++ b/tests/test_libero/libero-test-syn-user.tcl @@ -2,10 +2,10 @@ # Synplify Tcl Script # Libero -set_option -hdl_param -set vlogparam_bool=True +set_option -hdl_param -set vlogparam_bool=true set_option -hdl_param -set vlogparam_int=42 set_option -hdl_param -set vlogparam_str=hello -set_option -hdl_define -set vlogdefine_bool=True +set_option -hdl_define -set vlogdefine_bool=true set_option -hdl_define -set vlogdefine_int=42 set_option -hdl_define -set vlogdefine_str=hello