홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
4b146a79 1 parent a9929a98

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

Change-Id: Ib9569f25d23168b6d2f7beb80a4c3995a685c808
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -24,7 +24,7 @@ for attempt in {1..3}; do ...@@ -24,7 +24,7 @@ for attempt in {1..3}; do
24 # Check for differences 24 # Check for differences
25 case ${3:-equals} in 25 case ${3:-equals} in
26 equals) diff $aux.1 $aux.2;; 26 equals) diff $aux.1 $aux.2;;
27 - includes) [ $(egrep -c -f $aux.2 $aux.1) -eq $(wc -l $aux.2 | sed "s|$aux.2||g") ];; 27 + includes) [ $(egrep -c -f $aux.2 $aux.1) -ge $(wc -l $aux.2 | sed "s|$aux.2||g") ];;
28 excludes) ! egrep -f $aux.2 $aux.1;; 28 excludes) ! egrep -f $aux.2 $aux.1;;
29 esac 29 esac
30 30
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 <step name="Check-Components-${#}" 40 <step name="Check-Components-${#}"
41 exec="onos-check-components ${OC#}" 41 exec="onos-check-components ${OC#}"
42 requires="~Wait-for-Start-${#},"/> 42 requires="~Wait-for-Start-${#},"/>
43 - <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}" 43 + <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
44 requires="~Wait-for-Start-${#}"/> 44 requires="~Wait-for-Start-${#}"/>
45 </parallel> 45 </parallel>
46 </group> 46 </group>
......