<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16308">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">initial checkin of CCID tests<br><br>Change-Id: I35f41cb0097a4408afe7c31f42463baaa47f15bd<br>---<br>A ccid/CCID_Tests.cfg<br>A ccid/CCID_Tests.default<br>A ccid/CCID_Tests.ttcn<br>A ccid/gen_links.sh<br>A ccid/regen_makefile.sh<br>M deps/Makefile<br>6 files changed, 260 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/CCID_Tests.cfg b/ccid/CCID_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..de427b2</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/CCID_Tests.cfg</span><br><span>@@ -0,0 +1,20 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[ORDERED_INCLUDE]</span><br><span style="color: hsl(120, 100%, 40%);">+# Common configuration, shared between test suites</span><br><span style="color: hsl(120, 100%, 40%);">+"../Common.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+# testsuite specific configuration, not expected to change</span><br><span style="color: hsl(120, 100%, 40%);">+"./CCID_Tests.default"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Local configuration below</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[LOGGING]</span><br><span style="color: hsl(120, 100%, 40%);">+ConsoleMask := ERROR | WARNING | TESTCASE | USER;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MAIN_CONTROLLER]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[EXECUTE]</span><br><span style="color: hsl(120, 100%, 40%);">+CCID_Tests.control</span><br><span>diff --git a/ccid/CCID_Tests.default b/ccid/CCID_Tests.default</span><br><span>new file mode 100644</span><br><span>index 0000000..f441d67</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/CCID_Tests.default</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[LOGGING]</span><br><span style="color: hsl(120, 100%, 40%);">+mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[EXECUTE]</span><br><span>diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn</span><br><span>new file mode 100644</span><br><span>index 0000000..a985536</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/CCID_Tests.ttcn</span><br><span>@@ -0,0 +1,199 @@</span><br><span style="color: hsl(120, 100%, 40%);">+module CCID_Tests {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+import from General_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Misc_Helpers all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+import from USB_PortType all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+import from CCID_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from CCID_Templates all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from CCID_Emulation all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* global test component; manages CCID device */</span><br><span style="color: hsl(120, 100%, 40%);">+type component Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var CCID_Emulation_CT vc_CCID;</span><br><span style="color: hsl(120, 100%, 40%);">+ port USB_PT USB;</span><br><span style="color: hsl(120, 100%, 40%);">+ var Slot_CT vc_SLOT[NR_SLOTS];</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* per-slot test component; manages one slot */</span><br><span style="color: hsl(120, 100%, 40%);">+type component Slot_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint8_t g_slot_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ port CCID_SLOT_PT CCID;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer g_Tguard := 10.0;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private const integer NR_SLOTS := 4;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/***********************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * helper infrastructure</span><br><span style="color: hsl(120, 100%, 40%);">+ ***********************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type function void_fn() runs on Slot_CT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* altstep running on the per-slot test component */</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_Tguard() runs on Slot_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] g_Tguard.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_slot_nr := slot_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ CCID.receive(CCID_Emulation_Event:{up_down:=CCID_EVENT_UP});</span><br><span style="color: hsl(120, 100%, 40%);">+ g_Tguard.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_Tguard());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fn.apply();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* start a single slot handler */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_start_handler(void_fn fn, integer slot_nr) runs on Test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var Slot_CT vc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_SLOT[slot_nr] := Slot_CT.create("Slot" & int2str(slot_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_SLOT[slot_nr]:CCID, vc_CCID:SLOT[slot_nr]);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_SLOT[slot_nr].start(f_handler_init(fn, slot_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_wait_handlers_complete() runs on Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NR_SLOTS; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vc_SLOT[i] != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_SLOT[i].done;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_start_and_wait() runs on Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* start CCID_Emulation last, it will trigger all the per-slot components */</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_CCID.start(CCID_Emulation.main());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_wait_handlers_complete();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_init() runs on Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_CCID := CCID_Emulation_CT.create("CCID");</span><br><span style="color: hsl(120, 100%, 40%);">+ map(vc_CCID:USB, system:USB);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NR_SLOTS; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_SLOT[i] := null;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO) runs on Slot_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ CCID.send(ts_CCID_IccPowerOn(g_slot_nr, psel));</span><br><span style="color: hsl(120, 100%, 40%);">+ CCID.receive(tr_CCID_DataBlock(g_slot_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_xceive(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring {</span><br><span style="color: hsl(120, 100%, 40%);">+ var CCID_PDU pdu;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CCID.send(ts_CCID_XfrBlock(g_slot_nr, tx, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, rx)) -> value pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ return pdu.u.DataBlock.abData;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, ?)) -> value pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Received unexpected DataBlock ", pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CCID.receive(CCID_PDU:?) -> value pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Received unexpected CCID ", pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return ''O;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/***********************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * actual test cases</span><br><span style="color: hsl(120, 100%, 40%);">+ ***********************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* request 100 times the slot status */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_getstatus() runs on Slot_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < 100; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ CCID.send(ts_CCID_GetSlotStatus(g_slot_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* it would be fun to simply send more requests here, but the CCID</span><br><span style="color: hsl(120, 100%, 40%);">+ * spec doesn't permit more than one unresponded command [per slot] */</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CCID.receive(tr_CCID_SlotStatus(g_slot_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CCID.receive {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unexpected data from device");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_get_status() runs on Test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NR_SLOTS; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_handler(refers(f_TC_getstatus), i);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_and_wait();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_power_on() runs on Slot_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ f_power_on();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_power_on() runs on Test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NR_SLOTS; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_handler(refers(f_TC_power_on), i);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_and_wait();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_select_mf() runs on Slot_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_power_on();</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < 10000; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_xceive('00a40004023f00'O, ?);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_select_mf() runs on Test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < NR_SLOTS; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_handler(refers(f_TC_select_mf), i);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_and_wait();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+control {</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_get_status() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_power_on() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_select_mf() );</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..e53954b</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/gen_links.sh</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/bash</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+BASEDIR=../deps</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+. ../gen_links.sh.inc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src</span><br><span style="color: hsl(120, 100%, 40%);">+#FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#gen_links $DIR $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DIR=$BASEDIR/titan.TestPorts.USB/src</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="USB_PT.cc USB_PT.hh USB_PortType.ttcn USB_PortTypes.ttcn USB_Templates.ttcn USB_Types.ttcn USB_Component.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="CCID_Types.ttcn CCID_Templates.ttcn CCID_Emulation.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+gen_links $DIR $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DIR=../library</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="Native_Functions.ttcn Native_FunctionDefs.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+gen_links $DIR $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ignore_pp_results</span><br><span>diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..215d9c6</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/regen_makefile.sh</span><br><span>@@ -0,0 +1,9 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+../regen-makefile.sh CCID_Tests.ttcn $FILES</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libusb-1.0`/' Makefile</span><br><span>diff --git a/deps/Makefile b/deps/Makefile</span><br><span>index 2d8f687..5d263aa 100644</span><br><span>--- a/deps/Makefile</span><br><span>+++ b/deps/Makefile</span><br><span>@@ -67,7 +67,8 @@</span><br><span> titan.ProtocolEmulations.M3UA</span><br><span> </span><br><span> OSMOGIT_REPOS= titan.ProtocolModules.MAP \</span><br><span style="color: hsl(0, 100%, 40%);">- titan.ProtocolModules.BSSMAP</span><br><span style="color: hsl(120, 100%, 40%);">+ titan.ProtocolModules.BSSMAP \</span><br><span style="color: hsl(120, 100%, 40%);">+ titan.TestPorts.USB</span><br><span> </span><br><span> ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS)</span><br><span> </span><br><span>@@ -121,6 +122,7 @@</span><br><span> titan.TestPorts.TELNETasp_commit= R.9.A</span><br><span> titan.TestPorts.UDPasp_commit= R.8.A</span><br><span> titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-4-gbacd73d</span><br><span style="color: hsl(120, 100%, 40%);">+titan.TestPorts.USB_commit= master</span><br><span> </span><br><span> all: $(foreach dir,$(ALL_REPOS),$(dir)/update)</span><br><span> clean: $(foreach dir,$(ALL_REPOS),$(dir)/clean)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16308">change 16308</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/+/16308"/><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: I35f41cb0097a4408afe7c31f42463baaa47f15bd </div>
<div style="display:none"> Gerrit-Change-Number: 16308 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-MessageType: merged </div>