[Fuego] [PATCH 12/18] using common script to generate dbus test program

[Bird, Timothy]

> -----Original Message-----
> From: fuego-bounces at lists.linuxfoundation.org [mailto:fuego-
> bounces at lists.linuxfoundation.org] On Behalf Of Song Cai
> Sent: Friday, October 13, 2017 2:45 AM
> To: fuego at lists.linuxfoundation.org
> Subject: [Fuego] [PATCH 12/18] using common script to generate dbus test
> program
> 
> Signed-off-by: Song Cai <cais.fnst at cn.fujitsu.com>
> ---
>  .../commonAPI_Dbus.tar.gz                          | Bin 6320 -> 0 bytes
>  .../tests/Functional.commonAPI_Dbus/fuego_test.sh  |  34
> +++++++++++++--------
>  2 files changed, 22 insertions(+), 12 deletions(-)
>  delete mode 100755
> engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.tar.gz
> 
> diff --git
> a/engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.tar.gz
> b/engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.tar.gz
> deleted file mode 100755
> index
> 7f1b491803d44b4fb25b16ea50294e9bd1a4b6b7..0000000000000000000000000
> 000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
> 
> literal 6320
> zcmV;h7*FRPiwFQyY=l?<1MNNiQ{y<Y^DFr)wAm^y at R)o<?gE=v49xCQ#mrE
...[ binary stuff omitted]
> mNJT1Ak&0BLA{D7fMJiH}id3W`6{$#nzVvT4*9}Ji$N&I8dw_fZ
> 
> diff --git a/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
> b/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
> index 485d279..97ae6c9 100755
> --- a/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
> +++ b/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
> @@ -1,25 +1,35 @@
> -tarball=commonAPI_Dbus.tar.gz
> +#!/bin/bash
> 
> -function test_build {
> -    $CXX -std=gnu++11 HelloWorldService.cpp HelloWorldStubImpl.cpp
> HelloWorldDBusStubAdapter.cpp HelloWorldStubDefault.cpp
> HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-
> DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I
> $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I
> $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldService
> -    $CXX -std=gnu++11 HelloWorldClient.cpp HelloWorldDBusProxy.cpp
> HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-
> DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I
> $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I
> $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldClient
> +
> +tarball=../commonAPI/commonapi.tar.gz

I can't use this patch without the one that adds commonapi.tar.gz.
I suspect this was in patch 11, which got lost from this series.

Sorry - I have to drop this one.

> +source $FUEGO_CORE/engine/tests/commonAPI/common_api.sh
> +
> +function pre_check {
> +    is_on_target libCommonAPI.so COMMON_API /lib:/usr/lib:/usr/local/lib
> +    assert_define COMMON_API
> +    is_on_target libCommonAPI-DBus.so COMMON_API_DBUS
> /lib:/usr/lib:/usr/local/lib
> +    assert_define COMMON_API_DBUS
>  }
> 
> +
>  function test_deploy {
> -	put HelloWorldService $BOARD_TESTDIR/fuego.$TESTDIR/
> -	put HelloWorldClient $BOARD_TESTDIR/fuego.$TESTDIR/
> +    put build/project/commonAPI_Dbus/HelloWorldService
> $BOARD_TESTDIR/fuego.$TESTDIR/
> +    put build/project/commonAPI_Dbus/HelloWorldClient
> $BOARD_TESTDIR/fuego.$TESTDIR/
> +    put `find build -name 'libdbus-1.so*'` $BOARD_TESTDIR/fuego.$TESTDIR/
>  }
> 
>  function test_run {
> -	report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export
> PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
> -	if (./HelloWorldService &); then echo 'TEST-1 OK'; else echo 'TEST-1
> FAILED'; fi;\
> -	if ./HelloWorldClient; then echo 'TEST-2 OK'; else echo 'TEST-2
> FAILED'; fi;
> -	pkill HelloWorldServi"
> +    report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
> +        export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:\$PATH; \
> +        export LD_LIBRARY_PATH=\`pwd\`:\$LD_LIBRARY_PATH; chmod 777 *;\
> +        if (./HelloWorldService &); then echo 'TEST-1 OK'; else echo 'TEST-1
> FAILED'; fi;\
> +            if ./HelloWorldClient; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED';
> fi; \
> +                pkill HelloWorldServi"
>  }
> 
>  function test_processing {
> -	log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
> -    	log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
> +    log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
> +    log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
>  }
> 
> 
> --
> 2.9.3.windows.3

This needs another patch that isn't available to me.
Please send the required patches in a separate series again.
 -- Tim