commit 4b146a79ce5bdf9a456e181087a45094f499f71a
author Thomas Vachuska <tom@onlab.us> Wed Nov 18 12:04:50 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 18 20:05:38 2015 +0000
tree 8023f3ba19513141c6db49d3f216c800ba80b671
parent a9929a987b8ecd11fcdb23c08c0cf86bdceab711

Fixing onos-check-apps to work with app dependencies; short-term fix.

Change-Id: Ib9569f25d23168b6d2f7beb80a4c3995a685c808

tools/test/bin/onos-check-apps

diff --git a/tools/test/bin/onos-check-apps b/tools/test/bin/onos-check-apps
index dfd6b4e..5d83e41 100755
--- a/tools/test/bin/onos-check-apps
+++ b/tools/test/bin/onos-check-apps
@@ -24,7 +24,7 @@
     # Check for differences
     case ${3:-equals} in
     equals) diff $aux.1 $aux.2;;
-    includes) [ $(egrep -c -f $aux.2 $aux.1) -eq $(wc -l $aux.2 | sed "s|$aux.2||g") ];;
+    includes) [ $(egrep -c -f $aux.2 $aux.1) -ge $(wc -l $aux.2 | sed "s|$aux.2||g") ];;
     excludes) ! egrep -f $aux.2 $aux.1;;
     esac
 

tools/test/scenarios/setup.xml

diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index c26c0de..071db8b 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -40,7 +40,7 @@
             <step name="Check-Components-${#}"
                   exec="onos-check-components ${OC#}"
                   requires="~Wait-for-Start-${#},"/>
-            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
+            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
                   requires="~Wait-for-Start-${#}"/>
         </parallel>
     </group>