<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-dev/+/25192">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3.sh: don't build virtphy/trxcon/fake_trx<br><br>Remove leftovers from before refactoring in<br>Iecba5391dafc353058d369deb513b156534face1. No need to build these with<br>osmo-dev, as they are part of the osmocom-bb docker container that gets<br>built via ttcn3-bts-test/jenkins.sh.<br><br>Change-Id: I99ec4ff9caf34d1ddd7efde2f5ae2342a6984689<br>---<br>M ttcn3/ttcn3.sh<br>1 file changed, 3 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/92/25192/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh</span><br><span>index 6300ff7..20d6184 100755</span><br><span>--- a/ttcn3/ttcn3.sh</span><br><span>+++ b/ttcn3/ttcn3.sh</span><br><span>@@ -62,10 +62,10 @@</span><br><span> get_programs() {</span><br><span>    case "$PROJECT" in</span><br><span>                 bsc) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;</span><br><span style="color: hsl(0, 100%, 40%);">-            bts) echo "osmo-bsc osmo-bts-trx fake_trx.py trxcon" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+             bts) echo "osmo-bsc osmo-bts-trx" ;;</span><br><span>               msc) echo "osmo-stp osmo-msc" ;;</span><br><span>           pcu-sns) echo "osmo-pcu" ;;</span><br><span style="color: hsl(0, 100%, 40%);">-           pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual virtphy" ;;</span><br><span style="color: hsl(120, 100%, 40%);">+           pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;</span><br><span>          sgsn) echo "osmo-stp osmo-sgsn" ;;</span><br><span>                 sip) echo "osmo-sip-connector" ;;</span><br><span>          *) echo "osmo-$PROJECT" ;;</span><br><span>@@ -76,12 +76,9 @@</span><br><span> # $1: program name</span><br><span> get_program_repo() {</span><br><span>      case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">-          fake_trx.py) echo "osmocom-bb" ;;</span><br><span>          osmo-bts-*) echo "osmo-bts" ;;</span><br><span>             osmo-pcap-*) echo "osmo-pcap" ;;</span><br><span>           osmo-stp) echo "libosmo-sccp" ;;</span><br><span style="color: hsl(0, 100%, 40%);">-              trxcon) echo "osmocom-bb" ;;</span><br><span style="color: hsl(0, 100%, 40%);">-          virtphy) echo "osmocom-bb" ;;</span><br><span>              *) echo "$1" ;;</span><br><span>    esac</span><br><span> }</span><br><span>@@ -105,8 +102,7 @@</span><br><span>        echo "osmo-pcu   libosmocore"</span><br><span>      # just clone these, building is handled by ttcn3.sh</span><br><span>          echo "docker-playground"</span><br><span style="color: hsl(0, 100%, 40%);">-      echo "osmo-ttcn3-hacks"</span><br><span style="color: hsl(0, 100%, 40%);">-       echo "osmocom-bb") > ttcn3/3G+2G_ttcn3.deps</span><br><span style="color: hsl(120, 100%, 40%);">+      echo "osmo-ttcn3-hacks" ) > ttcn3/3G+2G_ttcn3.deps</span><br><span> </span><br><span>        local docker_cmd="$DIR_OSMODEV/ttcn3/scripts/docker_configure_make.sh"</span><br><span>     docker_cmd="$docker_cmd $USER/$DOCKER_IMG_BUILD"</span><br><span>@@ -179,21 +175,6 @@</span><br><span>    done</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Build a program that is in the subdir of a repository (e.g. trxcon in osmocom-bb.git).</span><br><span style="color: hsl(0, 100%, 40%);">-# $1: repository</span><br><span style="color: hsl(0, 100%, 40%);">-# $2: path in the repository</span><br><span style="color: hsl(0, 100%, 40%);">-build_osmo_program_subdir() {</span><br><span style="color: hsl(0, 100%, 40%);">-  clone_repo "$1"</span><br><span style="color: hsl(0, 100%, 40%);">-       cd "$DIR_OSMODEV/src/$1/$2"</span><br><span style="color: hsl(0, 100%, 40%);">-   if ! [ -e "./configure" ] && [ -e "configure.ac" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-            autoreconf -fi</span><br><span style="color: hsl(0, 100%, 40%);">-  fi</span><br><span style="color: hsl(0, 100%, 40%);">-      if ! [ -e "Makefile" ] && [ -e "Makefile.am" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-                ./configure</span><br><span style="color: hsl(0, 100%, 40%);">-     fi</span><br><span style="color: hsl(0, 100%, 40%);">-      make -j"$JOBS"</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Use osmo-dev to build a typical Osmocom program, and run a few sanity checks.</span><br><span> # $1 program</span><br><span> build_osmo_program_osmodev() {</span><br><span>@@ -231,9 +212,6 @@</span><br><span>         local program</span><br><span>        for program in $(get_programs); do</span><br><span>           case "$program" in</span><br><span style="color: hsl(0, 100%, 40%);">-                    fake_trx.py) clone_repo "osmocom-bb" ;;</span><br><span style="color: hsl(0, 100%, 40%);">-                       trxcon) build_osmo_program_subdir "osmocom-bb" "src/host/trxcon" ;;</span><br><span style="color: hsl(0, 100%, 40%);">-                 virtphy) build_osmo_program_subdir "osmocom-bb" "src/host/virt_phy" ;;</span><br><span>                   *) build_osmo_program_osmodev "$program" ;;</span><br><span>                esac</span><br><span>         done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-dev/+/25192">change 25192</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-dev/+/25192"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-dev </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I99ec4ff9caf34d1ddd7efde2f5ae2342a6984689 </div>
<div style="display:none"> Gerrit-Change-Number: 25192 </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-MessageType: newchange </div>