diff --git a/tools/test/bin/stc b/tools/test/bin/stc index c4c0d4335e..120d7fd44f 100755 --- a/tools/test/bin/stc +++ b/tools/test/bin/stc @@ -7,6 +7,8 @@ VER=1.3.0-SNAPSHOT JAR=~/.m2/repository/org/onosproject/onlab-stc/$VER/onlab-stc-$VER.jar SCENARIOS=$ONOS_ROOT/tools/test/scenarios +DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=y" + scenario=${1:-smoke} [ ! -f $scenario ] && scenario=$SCENARIOS/$scenario diff --git a/utils/stc/src/main/java/org/onlab/stc/Compiler.java b/utils/stc/src/main/java/org/onlab/stc/Compiler.java index 2a8a2ceb17..4d689623d7 100644 --- a/utils/stc/src/main/java/org/onlab/stc/Compiler.java +++ b/utils/stc/src/main/java/org/onlab/stc/Compiler.java @@ -309,7 +309,9 @@ public class Compiler { print("dependency name=%s requires=%s", name, requires); Step step = getStep(name, namespace); - processRequirements(step, requires, namespace); + if (!inactiveSteps.containsValue(step)) { + processRequirements(step, requires, namespace); + } } /** diff --git a/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java b/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java index 7963d1f429..35b200bfc9 100644 --- a/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java +++ b/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java @@ -69,8 +69,8 @@ public class CompilerTest { ProcessFlow flow = compiler.processFlow(); assertSame("incorrect scenario", scenario, compiler.scenario()); - assertEquals("incorrect step count", 25, flow.getVertexes().size()); - assertEquals("incorrect dependency count", 21, flow.getEdges().size()); + assertEquals("incorrect step count", 24, flow.getVertexes().size()); + assertEquals("incorrect dependency count", 17, flow.getEdges().size()); assertEquals("incorrect logDir", TEST_DIR.getAbsolutePath() + "/foo", compiler.logDir().getPath());