commit: http://blackfin.uclinux.org/git/?p=u-boot;a=commitdiff;h=e270d1e92ef85610fdd8877eee24c57444028f11 branch: http://blackfin.uclinux.org/git/?p=u-boot;a=shortlog;h=refs/heads/2012R2
Signed-off-by: Grace Pan <grace....@analog.com> --- test_script/convert_test_summary | 19 +++++++++---------- test_script/uboot_misc_test.exp | 8 +++++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/test_script/convert_test_summary b/test_script/convert_test_summary index fbdc3d1..d0b8f60 100755 --- a/test_script/convert_test_summary +++ b/test_script/convert_test_summary @@ -148,15 +148,16 @@ do gen_testcase "$result" "$class_name" "$case_name" "$test_time" "$result_xml" "$err_msg" "$err_msg_full" done - cp summary_remain summary done done -## Extract summary data from uboot-misc-test. +cp summary_bak summary + +# Extract summary data from uboot-misc-test. part2_head=1 - part2_end=`sed -n '/^$/{n;/^$/=;}' uboot-misc-test-summary-log | head -1` + part2_end=`cat uboot-misc-test-summary-log | wc -l` ((part2_end += 2)) part2_msg=`sed -n ''$part2_head','$part2_end'p' uboot-misc-test-summary-log ` echo "$part2_msg" > part2_file @@ -179,8 +180,7 @@ done # cd $this_log/logs/ #log_file=`grep -rl "icache $icache_status" "$timestamp" -m 1 | xargs grep -rl "dcache $dcache_status" -m 1 | xargs grep -l "Core" -m 1 ` folder="$this_log/$timestamp" - log_file=$folder/uboot-misc-test-summary-log - fi + log_file=$folder/uboot-misc-test-detailed-log #echo "###### $log_file ###\n" if [ -z $log_file ] ; then echo "Not find its log file!!!" @@ -219,10 +219,12 @@ do echo -e "\n********* ${case_status[$i]}($case_name): \n$err_msg " fi -# echo "$case_name " + #echo "$case_name " gen_testcase "$result" "$class_name" "$case_name" "$test_time" "$result_xml" "$err_msg" "$err_msg_full" + done + done - + # generate complete result.xml test_num=$((err_num + pass_num + skip_num + err_num2 + pass_num2 + skip_num2)) err_num=$((err_num + err_num2)) @@ -230,6 +232,3 @@ skip_num=$((skip_num + skip_num2)) pass_num=$((pass_num + pass_num2)) overall_time=0 complete_xml "$testsuite_name" "$err_num" "$fail_num" "$skip_num" "$test_num" "$overall_time" "$result_xml" - - -cp summary_bak summary diff --git a/test_script/uboot_misc_test.exp b/test_script/uboot_misc_test.exp index 66663ef..feb64dc 100755 --- a/test_script/uboot_misc_test.exp +++ b/test_script/uboot_misc_test.exp @@ -443,7 +443,7 @@ proc all_done { } { } send_user "\n" - send_user "Passing Tests\n" + send_user "Passed Tests\n" send_user "=====================================\n" for {set i [expr [llength $result_matrix]-1]} {$i>=0} {incr i -1} { set x [lindex $result_matrix $i] @@ -1317,6 +1317,12 @@ if { $TEST_BUILD_NAND } { } if { $board_type == "BF537-STAMP" } { + + if [ catch {exec sed -i "/#define CONFIG_MMC_SPI/d" include/configs/$config_file} ] { + send_user "\nfail disable MMC_SPI include/configs/$config_file\n" + set build_nand_result $TEST_FAIL + } + set search_str "CONFIG_NAND_PLAT" set change_str "#define CONFIG_NAND_PLAT" } else {
_______________________________________________ U-Boot-commits mailing list U-Boot-commits@blackfin.uclinux.org https://blackfin.uclinux.org/mailman/listinfo/u-boot-commits
