From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
lib/common-functions | 2 +-
lib/run-opentest | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/common-functions b/lib/common-functions
index 42a1148..ace8f86 100644
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -61,5 +61,5 @@ parse_config_file() {
general_log='$LOG_DIR/sdk-build-log.txt'
machine_build_log='$LOG_DIR/$m-build-log.txt'
-machine_test_log='$LOG_DIR/$m-test-log'
+machine_test_log='$LOG_DIR/$m-test-log.txt'
error_log='$LOG_DIR/error-log.txt'
diff --git a/lib/run-opentest b/lib/run-opentest
index f09466a..0017b5e 100644
--- a/lib/run-opentest
+++ b/lib/run-opentest
@@ -64,7 +64,7 @@ run_target_side_test() {
# Set m for logging purposes
m="$1"
- log $machine_build_log echo "testing machine $m"
+ log $machine_test_log echo "testing machine $m"
################################################################################
# Prepare the root file system for testing by:
@@ -285,7 +285,11 @@ run_target_side_test() {
# Call opentest framework. Echo the command being used for logging
echo "java -jar $OPENTEST_JAR --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot$skern$fwinit$pmmc$bootattempts$boottimeout~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--options \"priority 0\" --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$skern$fwinit$pmmc$bootattempts$boottimeout~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--options "priority 0" --params script=/$TEST_SCRIPTS_TGT/opentest.sh
+ if [ "${BUILD_LOG_VERBOSE}" = "true" ]; then
+ java -jar $OPENTEST_JAR --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot$skern$fwinit$pmmc$bootattempts$boottimeout~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--options "priority 0" --params script=/$TEST_SCRIPTS_TGT/opentest.sh 2>&1 |
eval tee -a $machine_test_log
+ else
+ java -jar $OPENTEST_JAR --template penguin --hw
platform=$oplatform,$OPENTEST_HW_CAP --sw
kernel=$kernel$dtb~kernel_modules=$spluart$uboot$skern$fwinit$pmmc$bootattempts$boottimeout~nfs=$ipaddr:$nfs_dir$ASSIGN_TO_TEE~test_scripts_root=git://http://arago-project.org/git/projects/test-automation/execution-engines/vatf-scripts.git
--options "priority 0" --params script=/$TEST_SCRIPTS_TGT/opentest.sh
+ fi
################################################################################
# Check the results of the opentest run.
--
2.2.0
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
