[Fuego] [PATCH 07/10] netpipe, ft2demos: fix them so they can be called by main.sh

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Fri Apr 28 08:28:29 UTC 2017


WARNING: untested

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/tests/Benchmark.netpipe/fuego_test.sh   | 53 +++++++++-----------------
 engine/tests/Functional.ft2demos/fuego_test.sh | 26 +------------
 2 files changed, 19 insertions(+), 60 deletions(-)

diff --git a/engine/tests/Benchmark.netpipe/fuego_test.sh b/engine/tests/Benchmark.netpipe/fuego_test.sh
index a70d75d..dc3a0fb 100755
--- a/engine/tests/Benchmark.netpipe/fuego_test.sh
+++ b/engine/tests/Benchmark.netpipe/fuego_test.sh
@@ -6,48 +6,29 @@ function test_build {
 }
 
 function test_deploy {
-	put NPtcp  $BOARD_TESTDIR/fuego.$TESTDIR/
+    put NPtcp  $BOARD_TESTDIR/fuego.$TESTDIR/
 }
 
 function test_run {
-	cmd "killall -SIGKILL NPtcp 2>/dev/null; exit 0"
+    cmd "killall -SIGKILL NPtcp 2>/dev/null; exit 0"
 
-	# Start netpipe server on Jenkins host
-	netpipe_exec=`which NPtcp`
+    # Start netpipe server on Jenkins host
+    netpipe_exec=`which NPtcp`
 
-	if [ -z $netpipe_exec ];
-	then 
-	 echo "ERROR: Cannot find netpipe"
-	 false
-	else
-	 $netpipe_exec -p 2 &
-	fi
+    if [ -z $netpipe_exec ]; then
+        echo "ERROR: Cannot find netpipe"
+        false
+    else
+        $netpipe_exec -p 2 &
+    fi
 
-        assert_define BENCHMARK_NETPIPE_PERT
+    assert_define BENCHMARK_NETPIPE_PERT
 
-	if [ "$BENCHMARK_NETPIPE_SRV" = "default" ]; then
-	  srv=$SRV_IP
-	else
-	  srv=$BENCHMARK_NETPIPE_SRV
-	fi
+    if [ "$BENCHMARK_NETPIPE_SRV" = "default" ]; then
+        srv=$SRV_IP
+    else
+        srv=$BENCHMARK_NETPIPE_SRV
+    fi
 
-	report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./NPtcp -h $srv -p $BENCHMARK_NETPIPE_PERT" $BOARD_TESTDIR/fuego.$TESTDIR/${TESTDIR}.log
+    report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./NPtcp -h $srv -p $BENCHMARK_NETPIPE_PERT" $BOARD_TESTDIR/fuego.$TESTDIR/${TESTDIR}.log
 }
-
-source $FUEGO_CORE/engine/scripts/functions.sh
-
-source $FUEGO_CORE/engine/scripts/overlays.sh
-set_overlay_vars
-
-
-pre_test $TESTDIR
-
-if $Rebuild; then
-    build
-fi
-
-deploy
-
-test_run
-
-
diff --git a/engine/tests/Functional.ft2demos/fuego_test.sh b/engine/tests/Functional.ft2demos/fuego_test.sh
index 9d42f77..24f2dbb 100755
--- a/engine/tests/Functional.ft2demos/fuego_test.sh
+++ b/engine/tests/Functional.ft2demos/fuego_test.sh
@@ -10,7 +10,7 @@ function test_build {
     a2=${tarball/*-}
     # Original Freetype2 package w/o tests.
     ft_tarball=freetype-${a2%.*.*}.tar.bz2
-   
+
     tar jxf "$TEST_HOME/$ft_tarball"
     mv ${ft_tarball%.*.*} freetype2
 
@@ -19,7 +19,6 @@ function test_build {
     make
 
     # Freetype2 Demos
-   
     cd ../${tarball%.tar*}
     patch -N -s -p0 < $TEST_HOME/ft2demos.Makefile.patch
     export PATH=/usr/local/bin/:$PATH
@@ -31,31 +30,10 @@ function test_deploy {
 }
 
 function test_run {
-    report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ls -1 /usr/share/fonts/truetype/* | xargs -n1 ./ftdump $1"  
+    report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ls -1 /usr/share/fonts/truetype/* | xargs -n1 ./ftdump $1"
 }
 
-
 function test_processing {
     log_compare "$TESTDIR" "12" ".*family:" "p"
     log_compare "$TESTDIR" "0" "fail|error|FAIL|ERROR" "n"
 }
-
-source $FUEGO_CORE/engine/scripts/overlays.sh
-set_overlay_vars
-
-source $FUEGO_CORE/engine/scripts/reports.sh
-source $FUEGO_CORE/engine/scripts/functions.sh
-
-pre_test $TESTDIR
-
-if $Rebuild; then
-    build nostrip
-fi
-
-deploy
-
-test_run
-
-get_testlog $TESTDIR
-
-test_processing
-- 
2.7.4




More information about the Fuego mailing list