<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">regen_makefile.sh: remove duplicate main file<br><br>Make the regen_makefile.sh more consistent by removing the "MAIN" file<br>on top, which some of them still have. All regen_makefile.sh have a<br>*.ttcn glob in FILES that match the main file too. So it is redundant<br>and can be removed.<br><br>Fix for warning:<br>ttcn3_makefilegen: warning: File `BSC_Tests.ttcn' was given more than once for the Makefile.<br><br>Related: OS#5252<br>Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f<br>---<br>M SCCP_Test/regen_makefile.sh<br>M bsc-nat/regen_makefile.sh<br>M bsc/regen_makefile.sh<br>M hlr/regen_makefile.sh<br>M selftest/regen_makefile.sh<br>M smlc/regen_makefile.sh<br>6 files changed, 6 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/25758/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh</span><br><span>index f5d13b7..6eaeb03 100755</span><br><span>--- a/SCCP_Test/regen_makefile.sh</span><br><span>+++ b/SCCP_Test/regen_makefile.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MAIN=SCCP_Testcases.ttcn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES="</span><br><span>       *.ttcn</span><br><span>       *.ttcnpp</span><br><span>@@ -10,4 +8,4 @@</span><br><span> export CPPFLAGS_TTCN3="</span><br><span> "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-../regen-makefile.sh $MAIN $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh $FILES</span><br><span>diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh</span><br><span>index 33b557c..6838904 100755</span><br><span>--- a/bsc-nat/regen_makefile.sh</span><br><span>+++ b/bsc-nat/regen_makefile.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MAIN=BSCNAT_Tests.ttcn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES="</span><br><span>    *.c</span><br><span>  *.ttcn</span><br><span>@@ -29,4 +27,4 @@</span><br><span>   -DUSE_MTP3_DISTRIBUTOR</span><br><span> "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-../regen-makefile.sh $MAIN $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh $FILES</span><br><span>diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh</span><br><span>index 53f8e82..d21a709 100755</span><br><span>--- a/bsc/regen_makefile.sh</span><br><span>+++ b/bsc/regen_makefile.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MAIN=BSC_Tests.ttcn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES="</span><br><span>    *.c</span><br><span>  *.ttcn</span><br><span>@@ -34,4 +32,4 @@</span><br><span>   -DUSE_MTP3_DISTRIBUTOR</span><br><span> "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-../regen-makefile.sh $MAIN $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh $FILES</span><br><span>diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh</span><br><span>index 9ab40ce..a69419d 100755</span><br><span>--- a/hlr/regen_makefile.sh</span><br><span>+++ b/hlr/regen_makefile.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MAIN="HLR_Tests.ttcn"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES="</span><br><span>        *.asn</span><br><span>        *.ttcn</span><br><span>@@ -24,4 +22,4 @@</span><br><span>   -DIPA_EMULATION_CTRL</span><br><span> "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-../regen-makefile.sh $MAIN $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh $FILES</span><br><span>diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh</span><br><span>index 17854ce..3fc0e89 100755</span><br><span>--- a/selftest/regen_makefile.sh</span><br><span>+++ b/selftest/regen_makefile.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MAIN=Selftest.ttcn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES="</span><br><span>   *.ttcn</span><br><span>       *.ttcnpp</span><br><span>@@ -19,4 +17,4 @@</span><br><span>         -DUSE_MTP3_DISTRIBUTOR</span><br><span> "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-../regen-makefile.sh $MAIN $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh $FILES</span><br><span>diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh</span><br><span>index 24e3407..da296a8 100755</span><br><span>--- a/smlc/regen_makefile.sh</span><br><span>+++ b/smlc/regen_makefile.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MAIN=SMLC_Tests.ttcn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILES="</span><br><span>       *.c</span><br><span>  *.ttcn</span><br><span>@@ -32,4 +30,4 @@</span><br><span>   -DUSE_MTP3_DISTRIBUTOR</span><br><span> "</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-../regen-makefile.sh $MAIN $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh $FILES</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758">change 25758</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f </div>
<div style="display:none"> Gerrit-Change-Number: 25758 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>