<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/26305">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests/tdef: rename the binaries to end with '_test'<br><br>It's the usual naming for unit test binaries. Without the '_test' endig,<br>the tdef_vty_test_{config_root,config_subnode,dynamic} binaries do not<br>match the 'tests/*/*_test' pattern and appear as untracked files in git.<br><br>Change-Id: I828fa45132e11a41c527d4b25df850c19871cb75<br>---<br>M src/tdef.c<br>M src/vty/tdef_vty.c<br>M tests/Makefile.am<br>R tests/tdef/tdef_vty_config_root_test.c<br>R tests/tdef/tdef_vty_config_root_test.vty<br>R tests/tdef/tdef_vty_config_subnode_test.c<br>R tests/tdef/tdef_vty_config_subnode_test.vty<br>R tests/tdef/tdef_vty_dynamic_test.c<br>R tests/tdef/tdef_vty_dynamic_test.vty<br>9 files changed, 25 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tdef.c b/src/tdef.c</span><br><span>index 9890f95..75b884a 100644</span><br><span>--- a/src/tdef.c</span><br><span>+++ b/src/tdef.c</span><br><span>@@ -52,18 +52,18 @@</span><br><span> * By keeping separate osmo_tdef arrays, several groups of timers can be kept</span><br><span> * separately. The VTY tests in tests/tdef/ showcase different schemes:</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * - \ref tests/vty/tdef_vty_test_config_root.c:</span><br><span style="color: hsl(120, 100%, 40%);">+ * - \ref tests/vty/tdef_vty_config_root_test.c:</span><br><span> * Keep several timer definitions in separately named groups: showcase the</span><br><span> * osmo_tdef_vty_groups*() API. Each timer group exists exactly once.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * - \ref tests/vty/tdef_vty_test_config_subnode.c:</span><br><span style="color: hsl(120, 100%, 40%);">+ * - \ref tests/vty/tdef_vty_config_subnode_test.c:</span><br><span> * Keep a single list of timers without separate grouping.</span><br><span> * Put this list on a specific subnode below the CONFIG_NODE.</span><br><span> * There could be several separate subnodes with timers like this, i.e.</span><br><span> * continuing from this example, sets of timers could be separated by placing</span><br><span> * timers in specific config subnodes instead of using the global group name.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * - \ref tests/vty/tdef_vty_test_dynamic.c:</span><br><span style="color: hsl(120, 100%, 40%);">+ * - \ref tests/vty/tdef_vty_dynamic_test.c:</span><br><span> * Dynamically allocate timer definitions per each new created object.</span><br><span> * Thus there can be an arbitrary number of independent timer definitions, one</span><br><span> * per allocated object.</span><br><span>diff --git a/src/vty/tdef_vty.c b/src/vty/tdef_vty.c</span><br><span>index 09459f1..bd209ae 100644</span><br><span>--- a/src/vty/tdef_vty.c</span><br><span>+++ b/src/vty/tdef_vty.c</span><br><span>@@ -242,7 +242,7 @@</span><br><span> </span><br><span> /*! Write current timer configuration arguments to the vty. Skip all entries that reflect their default value.</span><br><span> * The passed prefix string must contain both necessary indent and the VTY command the specific implementation is using.</span><br><span style="color: hsl(0, 100%, 40%);">- * See tdef_vty_test_config_subnode.c and tdef_vty_test_dynamic.c for examples.</span><br><span style="color: hsl(120, 100%, 40%);">+ * See tdef_vty_config_subnode_test.c and tdef_vty_dynamic_test.c for examples.</span><br><span> * \param[in] vty VTY context.</span><br><span> * \param[in] tdefs Array of timers to print, ended with a fully zero-initialized entry.</span><br><span> * \param[in] prefix_fmt Arbitrary string to start each line with, with variable printf like arguments.</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index c44b6f0..a6f6017 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -28,9 +28,9 @@</span><br><span> oap/oap_client_test gsm29205/gsm29205_test \</span><br><span> logging/logging_vty_test \</span><br><span> vty/vty_transcript_test \</span><br><span style="color: hsl(0, 100%, 40%);">- tdef/tdef_test tdef/tdef_vty_test_config_root \</span><br><span style="color: hsl(0, 100%, 40%);">- tdef/tdef_vty_test_config_subnode \</span><br><span style="color: hsl(0, 100%, 40%);">- tdef/tdef_vty_test_dynamic \</span><br><span style="color: hsl(120, 100%, 40%);">+ tdef/tdef_test tdef/tdef_vty_config_root_test \</span><br><span style="color: hsl(120, 100%, 40%);">+ tdef/tdef_vty_config_subnode_test \</span><br><span style="color: hsl(120, 100%, 40%);">+ tdef/tdef_vty_dynamic_test \</span><br><span> sockaddr_str/sockaddr_str_test \</span><br><span> use_count/use_count_test \</span><br><span> context/context_test \</span><br><span>@@ -286,14 +286,14 @@</span><br><span> tdef_tdef_test_SOURCES = tdef/tdef_test.c</span><br><span> tdef_tdef_test_LDADD = $(LDADD)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-tdef_tdef_vty_test_config_root_SOURCES = tdef/tdef_vty_test_config_root.c</span><br><span style="color: hsl(0, 100%, 40%);">-tdef_tdef_vty_test_config_root_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la</span><br><span style="color: hsl(120, 100%, 40%);">+tdef_tdef_vty_config_root_test_SOURCES = tdef/tdef_vty_config_root_test.c</span><br><span style="color: hsl(120, 100%, 40%);">+tdef_tdef_vty_config_root_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-tdef_tdef_vty_test_config_subnode_SOURCES = tdef/tdef_vty_test_config_subnode.c</span><br><span style="color: hsl(0, 100%, 40%);">-tdef_tdef_vty_test_config_subnode_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la</span><br><span style="color: hsl(120, 100%, 40%);">+tdef_tdef_vty_config_subnode_test_SOURCES = tdef/tdef_vty_config_subnode_test.c</span><br><span style="color: hsl(120, 100%, 40%);">+tdef_tdef_vty_config_subnode_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-tdef_tdef_vty_test_dynamic_SOURCES = tdef/tdef_vty_test_dynamic.c</span><br><span style="color: hsl(0, 100%, 40%);">-tdef_tdef_vty_test_dynamic_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la</span><br><span style="color: hsl(120, 100%, 40%);">+tdef_tdef_vty_dynamic_test_SOURCES = tdef/tdef_vty_dynamic_test.c</span><br><span style="color: hsl(120, 100%, 40%);">+tdef_tdef_vty_dynamic_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la</span><br><span> </span><br><span> sockaddr_str_sockaddr_str_test_SOURCES = sockaddr_str/sockaddr_str_test.c</span><br><span> sockaddr_str_sockaddr_str_test_LDADD = $(LDADD)</span><br><span>@@ -402,9 +402,9 @@</span><br><span> vty/vty_transcript_test.vty \</span><br><span> tdef/tdef_test.ok \</span><br><span> tdef/tdef_test_range_64bit.ok \</span><br><span style="color: hsl(0, 100%, 40%);">- tdef/tdef_vty_test_config_root.vty \</span><br><span style="color: hsl(0, 100%, 40%);">- tdef/tdef_vty_test_config_subnode.vty \</span><br><span style="color: hsl(0, 100%, 40%);">- tdef/tdef_vty_test_dynamic.vty \</span><br><span style="color: hsl(120, 100%, 40%);">+ tdef/tdef_vty_config_root_test.vty \</span><br><span style="color: hsl(120, 100%, 40%);">+ tdef/tdef_vty_config_subnode_test.vty \</span><br><span style="color: hsl(120, 100%, 40%);">+ tdef/tdef_vty_dynamic_test.vty \</span><br><span> sockaddr_str/sockaddr_str_test.ok \</span><br><span> use_count/use_count_test.ok use_count/use_count_test.err \</span><br><span> context/context_test.ok \</span><br><span>@@ -678,16 +678,16 @@</span><br><span> vty-test-tdef:</span><br><span> osmo_verify_transcript_vty.py -v \</span><br><span> -p 42042 \</span><br><span style="color: hsl(0, 100%, 40%);">- -r "$(top_builddir)/tests/tdef/tdef_vty_test_config_root" \</span><br><span style="color: hsl(0, 100%, 40%);">- $(U) $(srcdir)/tdef/tdef_vty_test_config_root.vty</span><br><span style="color: hsl(120, 100%, 40%);">+ -r "$(top_builddir)/tests/tdef/tdef_vty_config_root_test" \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(U) $(srcdir)/tdef/tdef_vty_config_root_test.vty</span><br><span> osmo_verify_transcript_vty.py -v \</span><br><span> -p 42042 \</span><br><span style="color: hsl(0, 100%, 40%);">- -r "$(top_builddir)/tests/tdef/tdef_vty_test_config_subnode" \</span><br><span style="color: hsl(0, 100%, 40%);">- $(U) $(srcdir)/tdef/tdef_vty_test_config_subnode.vty</span><br><span style="color: hsl(120, 100%, 40%);">+ -r "$(top_builddir)/tests/tdef/tdef_vty_config_subnode_test" \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(U) $(srcdir)/tdef/tdef_vty_config_subnode_test.vty</span><br><span> osmo_verify_transcript_vty.py -v \</span><br><span> -p 42042 \</span><br><span style="color: hsl(0, 100%, 40%);">- -r "$(top_builddir)/tests/tdef/tdef_vty_test_dynamic" \</span><br><span style="color: hsl(0, 100%, 40%);">- $(U) $(srcdir)/tdef/tdef_vty_test_dynamic.vty</span><br><span style="color: hsl(120, 100%, 40%);">+ -r "$(top_builddir)/tests/tdef/tdef_vty_dynamic_test" \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(U) $(srcdir)/tdef/tdef_vty_dynamic_test.vty</span><br><span> </span><br><span> vty-test-stats:</span><br><span> osmo_verify_transcript_vty.py -v \</span><br><span>diff --git a/tests/tdef/tdef_vty_test_config_root.c b/tests/tdef/tdef_vty_config_root_test.c</span><br><span>similarity index 97%</span><br><span>rename from tests/tdef/tdef_vty_test_config_root.c</span><br><span>rename to tests/tdef/tdef_vty_config_root_test.c</span><br><span>index 92113e8..0472ad5 100644</span><br><span>--- a/tests/tdef/tdef_vty_test_config_root.c</span><br><span>+++ b/tests/tdef/tdef_vty_config_root_test.c</span><br><span>@@ -45,7 +45,7 @@</span><br><span> /* ------------------- HERE IS THE INTERESTING TDEF RELEVANT PART ------------------- */</span><br><span> </span><br><span> /* This example keeps several separate timer groups and offers 'timer' VTY commands at the root of the config node. See</span><br><span style="color: hsl(0, 100%, 40%);">- * the tdef_vty_test_config_root.vty transcript test.</span><br><span style="color: hsl(120, 100%, 40%);">+ * the tdef_vty_config_root_test.vty transcript test.</span><br><span> */</span><br><span> </span><br><span> static struct osmo_tdef tdefs_test[] = {</span><br><span>@@ -102,7 +102,7 @@</span><br><span> /* This example puts 'timer' configuration commands directly at the root of the CONFIG_NODE.</span><br><span> * This TIMER_NODE is merely needed as a hook for the vty_write() command, but becomes an empty node in the VTY docs.</span><br><span> * It is possible to cheat around needing this if you choose to config_write_timer() in another root nodes' write cb.</span><br><span style="color: hsl(0, 100%, 40%);">- * Another example using a 'network' subnode is \ref tdef_vty_test_config_subnode.c */</span><br><span style="color: hsl(120, 100%, 40%);">+ * Another example using a 'network' subnode is \ref tdef_vty_config_subnode_test.c */</span><br><span> static struct cmd_node timer_node = {</span><br><span> TIMER_NODE,</span><br><span> "%s(config-timer)# ",</span><br><span>diff --git a/tests/tdef/tdef_vty_test_config_root.vty b/tests/tdef/tdef_vty_config_root_test.vty</span><br><span>similarity index 100%</span><br><span>rename from tests/tdef/tdef_vty_test_config_root.vty</span><br><span>rename to tests/tdef/tdef_vty_config_root_test.vty</span><br><span>diff --git a/tests/tdef/tdef_vty_test_config_subnode.c b/tests/tdef/tdef_vty_config_subnode_test.c</span><br><span>similarity index 98%</span><br><span>rename from tests/tdef/tdef_vty_test_config_subnode.c</span><br><span>rename to tests/tdef/tdef_vty_config_subnode_test.c</span><br><span>index ce851f5..ff19150 100644</span><br><span>--- a/tests/tdef/tdef_vty_test_config_subnode.c</span><br><span>+++ b/tests/tdef/tdef_vty_config_subnode_test.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> </span><br><span> /* This example keeps a single global timer group and offers a custom 'timer' VTY command in a 'network' subnode below</span><br><span> * the CONFIG_NODE.</span><br><span style="color: hsl(0, 100%, 40%);">- * the tdef_vty_test_config_subnode.vty transcript test.</span><br><span style="color: hsl(120, 100%, 40%);">+ * the tdef_vty_config_subnode_test.vty transcript test.</span><br><span> */</span><br><span> </span><br><span> static struct osmo_tdef global_tdefs[] = {</span><br><span>diff --git a/tests/tdef/tdef_vty_test_config_subnode.vty b/tests/tdef/tdef_vty_config_subnode_test.vty</span><br><span>similarity index 100%</span><br><span>rename from tests/tdef/tdef_vty_test_config_subnode.vty</span><br><span>rename to tests/tdef/tdef_vty_config_subnode_test.vty</span><br><span>diff --git a/tests/tdef/tdef_vty_test_dynamic.c b/tests/tdef/tdef_vty_dynamic_test.c</span><br><span>similarity index 100%</span><br><span>rename from tests/tdef/tdef_vty_test_dynamic.c</span><br><span>rename to tests/tdef/tdef_vty_dynamic_test.c</span><br><span>diff --git a/tests/tdef/tdef_vty_test_dynamic.vty b/tests/tdef/tdef_vty_dynamic_test.vty</span><br><span>similarity index 100%</span><br><span>rename from tests/tdef/tdef_vty_test_dynamic.vty</span><br><span>rename to tests/tdef/tdef_vty_dynamic_test.vty</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/26305">change 26305</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/libosmocore/+/26305"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I828fa45132e11a41c527d4b25df850c19871cb75 </div>
<div style="display:none"> Gerrit-Change-Number: 26305 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>