Build Error Fix / Testcases Broken (old commit mixed)

During the recent CI failure, broken testcases (obsolete cases)
were mixed up.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/tests/nnstreamer_filter_custom/runTest.sh b/tests/nnstreamer_filter_custom/runTest.sh
index f6cd5fa..e644de7 100644 (file)
--- a/tests/nnstreamer_filter_custom/runTest.sh
+++ b/tests/nnstreamer_filter_custom/runTest.sh
@@ -109,12 +109,12 @@ testResult $? 14 "Golden test comparison" 0 1
 # Test average using OpenCV (15)
 # custom version
 PATH_TO_MODEL_A="../../build/nnstreamer_example/custom_example_average/libnnstreamer_customfilter_average.so"
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} videotestsrc num-buffers=1 ! video/x-raw,format=RGB,width=640,height=480,framerate=0/1 ! videoconvert ! video/x-raw, format=RGB ! tensor_converter ! tensor_filter framework=\"custom\" model=\"${PATH_TO_MODEL_A}\" ! filesink location=\"testcase15.average.log\" sync=true" 15
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} videotestsrc num-buffers=1 ! video/x-raw,format=RGB,width=640,height=480,framerate=0/1 ! videoconvert ! video/x-raw, format=RGB ! tensor_converter ! tensor_filter framework=\"custom\" model=\"${PATH_TO_MODEL_A}\" ! filesink location=\"testcase15.average.log\" sync=true" 15 0 0 $PERFORMANCE
 
 # OpenCV version
 PATH_TO_MODEL_A="../../build/nnstreamer_example/custom_example_opencv/libnnstreamer_customfilter_opencv_average.so"
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} videotestsrc num-buffers=1 ! video/x-raw,format=RGB,width=640,height=480,framerate=0/1 ! videoconvert ! video/x-raw, format=RGB ! tensor_converter ! tensor_filter framework=\"custom\" model=\"${PATH_TO_MODEL_A}\" ! filesink location=\"testcase15.opencv.average.log\" sync=true" 15
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} videotestsrc num-buffers=1 ! video/x-raw,format=RGB,width=640,height=480,framerate=0/1 ! videoconvert ! video/x-raw, format=RGB ! tensor_converter ! tensor_filter framework=\"custom\" model=\"${PATH_TO_MODEL_A}\" ! filesink location=\"testcase15.opencv.average.log\" sync=true" 15 0 0 $PERFORMANCE
 
-compareAll testcase15.opencv.average.log testcase15.average.log 15
+callCompareTest testcase15.opencv.average.log testcase15.average.log 15 "Compare 15" 0 0
 
 report

diff --git a/tests/nnstreamer_merge/runTest.sh b/tests/nnstreamer_merge/runTest.sh
index 55a17b0..074d68f 100644 (file)
--- a/tests/nnstreamer_merge/runTest.sh
+++ b/tests/nnstreamer_merge/runTest.sh
@@ -71,25 +71,25 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_m
 
 callCompareTest batch.golden batch.log 10 "Compare 10" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_merge name=merge mode=linear option=2 silent=false ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_1" 11
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_merge name=merge mode=linear option=2 silent=false ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_1" 11 0 0 $PERFORMANCE
 
-compareAllSizeLimit testsynch00_0.log testsynch00_0.golden 11-1
-compareAllSizeLimit testsynch00_1.log testsynch00_1.golden 11-2
-compareAllSizeLimit testsynch00_2.log testsynch00_2.golden 11-3
-compareAllSizeLimit testsynch00_3.log testsynch00_3.golden 11-4
+callCompareTest testsynch00_0.log testsynch00_0.golden 11-1 "Compare 11-1" 1 0
+callCompareTest testsynch00_1.log testsynch00_1.golden 11-2 "Compare 11-2" 1 0
+callCompareTest testsynch00_2.log testsynch00_2.golden 11-3 "Compare 11-3" 1 0
+callCompareTest testsynch00_3.log testsynch00_3.golden 11-4 "Compare 11-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_merge name=merge mode=linear option=2 silent=false ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1" 12
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_merge name=merge mode=linear option=2 silent=false ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1" 12 0 0 $PERFORMANCE
 
-compareAllSizeLimit testsynch01_0.log testsynch01_0.golden 12-1
-compareAllSizeLimit testsynch01_1.log testsynch01_1.golden 12-2
-compareAllSizeLimit testsynch01_2.log testsynch01_2.golden 12-3
-compareAllSizeLimit testsynch01_3.log testsynch01_3.golden 12-4
+callCompareTest testsynch01_0.log testsynch01_0.golden 12-1 "Compare 12-1" 1 0
+callCompareTest testsynch01_1.log testsynch01_1.golden 12-2 "Compare 12-2" 1 0
+callCompareTest testsynch01_2.log testsynch01_2.golden 12-3 "Compare 12-3" 1 0
+callCompareTest testsynch01_3.log testsynch01_3.golden 12-4 "Compare 12-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_merge name=merge mode=linear option=2 silent=false ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 13
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_merge:5 tensor_merge name=merge mode=linear option=2 silent=false ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! merge.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! merge.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! merge.sink_2" 13 0 0 $PERFORMANCE
 
-compareAllSizeLimit testsynch02_0.log testsynch02_0.golden 13-1
-compareAllSizeLimit testsynch02_1.log testsynch02_1.golden 13-2
-compareAllSizeLimit testsynch02_2.log testsynch02_2.golden 13-3
-compareAllSizeLimit testsynch02_3.log testsynch02_3.golden 13-4
+callCompareTest testsynch02_0.log testsynch02_0.golden 13-1 "Compare 13-1" 1 0
+callCompareTest testsynch02_1.log testsynch02_1.golden 13-2 "Compare 13-2" 1 0
+callCompareTest testsynch02_2.log testsynch02_2.golden 13-3 "Compare 13-3" 1 0
+callCompareTest testsynch02_3.log testsynch02_3.golden 13-4 "Compare 13-4" 1 0
 
 report

diff --git a/tests/nnstreamer_mux/runTest.sh b/tests/nnstreamer_mux/runTest.sh
index 8374a4f..4337384 100644 (file)
--- a/tests/nnstreamer_mux/runTest.sh
+++ b/tests/nnstreamer_mux/runTest.sh
@@ -57,25 +57,25 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux
 
 callCompareTest testcase03.golden testcase03.log 7 "Compare 7" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_1" 8
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! multifilesink location=testsynch00_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_1" 8 0 0 $PERFORMANCE
 
-compareAllSizeLimit testsynch00_0.log testsynch00_0.golden 8-1
-compareAllSizeLimit testsynch00_1.log testsynch00_1.golden 8-2
-compareAllSizeLimit testsynch00_2.log testsynch00_2.golden 8-3
-compareAllSizeLimit testsynch00_3.log testsynch00_3.golden 8-4
+callCompareTest testsynch00_0.log testsynch00_0.golden 8-1 "Compare 8-1" 1 0
+callCompareTest testsynch00_1.log testsynch00_1.golden 8-2 "Compare 8-2" 1 0
+callCompareTest testsynch00_2.log testsynch00_2.golden 8-3 "Compare 8-3" 1 0
+callCompareTest testsynch00_3.log testsynch00_3.golden 8-4 "Compare 8-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1" 9
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! multifilesink location=testsynch01_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1" 9 0 0 $PERFORMANCE
 
-compareAllSizeLimit testsynch01_0.log testsynch01_0.golden 9-1
-compareAllSizeLimit testsynch01_1.log testsynch01_1.golden 9-2
-compareAllSizeLimit testsynch01_2.log testsynch01_2.golden 9-3
-compareAllSizeLimit testsynch01_3.log testsynch01_3.golden 9-4
+callCompareTest testsynch01_0.log testsynch01_0.golden 9-1 "Compare 9-1" 1 0
+callCompareTest testsynch01_1.log testsynch01_1.golden 9-2 "Compare 9-2" 1 0
+callCompareTest testsynch01_2.log testsynch01_2.golden 9-3 "Compare 9-3" 1 0
+callCompareTest testsynch01_3.log testsynch01_3.golden 9-4 "Compare 9-4" 1 0
 
-gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_2" 10
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} --gst-debug=tensor_mux:5 tensor_mux name=mux ! multifilesink location=testsynch02_%1d.log multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)30/1\" ! pngdec ! tensor_converter ! mux.sink_0 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)20/1\" ! pngdec ! tensor_converter ! mux.sink_1 multifilesrc location=\"testsequence03_%1d.png\" index=0 caps=\"image/png, framerate=(fraction)10/1\" ! pngdec ! tensor_converter ! mux.sink_2" 10 0 0 $PERFORMANCE
 
-compareAllSizeLimit testsynch02_0.log testsynch02_0.golden 10-1
-compareAllSizeLimit testsynch02_1.log testsynch02_1.golden 10-2
-compareAllSizeLimit testsynch02_2.log testsynch02_2.golden 10-3
-compareAllSizeLimit testsynch02_3.log testsynch02_3.golden 10-4
+callCompareTest testsynch02_0.log testsynch02_0.golden 10-1 "Compare 10-1" 1 0
+callCompareTest testsynch02_1.log testsynch02_1.golden 10-2 "Compare 10-2" 1 0
+callCompareTest testsynch02_2.log testsynch02_2.golden 10-3 "Compare 10-3" 1 0
+callCompareTest testsynch02_3.log testsynch02_3.golden 10-4 "Compare 10-4" 1 0
 
 report