From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
lib/run-opentest | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/run-opentest b/lib/run-opentest
index bf779e8..9a8e45b 100644
--- a/lib/run-opentest
+++ b/lib/run-opentest
@@ -139,9 +139,20 @@ run_target_side_test() {
return 1
fi
- # Extrace the CLI utility
+ # Extract the CLI utility
tar xf $OPENTEST_CLI
+ # New version of CLI has "client" subdir
+ mv client/* . || true
+
+ # New version of CLI has no version in JAR name
+ if [ -e opentest_cli_0.7.jar ]
+ then
+ OPENTEST_JAR="opentest_cli_0.7.jar"
+ else
+ OPENTEST_JAR="opentest_cli.jar"
+ fi
+
# Determine the oplatform to use for testing
set_opentest_platform $m
@@ -228,8 +239,8 @@ run_target_side_test() {
fi
# Call opentest framework. Echo the command being used for logging
- echo "java -jar opentest_cli_0.7.jar --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--params script=/$TEST_SCRIPTS_TGT/opentest.sh"
- java -jar opentest_cli_0.7.jar --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--params script=/$TEST_SCRIPTS_TGT/opentest.sh
+ echo "java -jar $OPENTEST_JAR --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--params script=/$TEST_SCRIPTS_TGT/opentest.sh"
+ java -jar $OPENTEST_JAR --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--params script=/$TEST_SCRIPTS_TGT/opentest.sh
################################################################################
# Check the results of the opentest run.
--
1.7.9.5
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
