From 7aa5142f82e87fa25fd3652ea74e416e02a185f5 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 16 Jun 2016 23:24:24 +0300 Subject: vsp-lib: Handle logging internally Remove the need to pipe individual commands to the logger from the test scripts by moving all logging code internally to vsp-lib and vsp-runner. As an interesting side effect the removal of shell pipes from the test scripts avoids running functions in subshells. This makes it possible for the pipeline configuration functions to set variables that can be used later. Signed-off-by: Laurent Pinchart --- tests/vsp-unit-test-0005.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'tests/vsp-unit-test-0005.sh') diff --git a/tests/vsp-unit-test-0005.sh b/tests/vsp-unit-test-0005.sh index aeb0ca2..2ba11bf 100755 --- a/tests/vsp-unit-test-0005.sh +++ b/tests/vsp-unit-test-0005.sh @@ -15,12 +15,11 @@ test_rpf() { test_start "RPF.$rpf" - pipe_configure rpf-wpf $rpf 0 | ./logger.sh config >> $logfile - format_configure rpf-wpf $rpf 0 \ - $format 1024x768 $format | ./logger.sh config >> $logfile + pipe_configure rpf-wpf $rpf 0 + format_configure rpf-wpf $rpf 0 $format 1024x768 $format - $vsp_runner $mdev input $rpf $format | ./logger.sh input.0 >> $logfile & - $vsp_runner $mdev output 0 $format | ./logger.sh output.0 >> $logfile + $vsp_runner $mdev input $rpf $format & + $vsp_runner $mdev output 0 $format result=$(compare_frames exact reference $format 0) @@ -32,19 +31,18 @@ test_wpf() { test_start "WPF.$wpf" - pipe_configure rpf-wpf 0 $wpf | ./logger.sh config >> $logfile - format_configure rpf-wpf 0 $wpf \ - $format 1024x768 $format | ./logger.sh config >> $logfile + pipe_configure rpf-wpf 0 $wpf + format_configure rpf-wpf 0 $wpf $format 1024x768 $format - $vsp_runner $mdev input 0 $format | ./logger.sh input.0 >> $logfile & - $vsp_runner $mdev output $wpf $format | ./logger.sh output.0 >> $logfile + $vsp_runner $mdev input 0 $format & + $vsp_runner $mdev output $wpf $format result=$(compare_frames exact reference $format $wpf) test_complete $result } -test_run() { +test_main() { num_rpfs=$(vsp1_count_rpfs) num_wpfs=$(vsp1_count_wpfs) -- cgit v1.2.3