From 306c53b308c2ff7b6344b413332bf7ea040e852a Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sat, 18 Jun 2016 02:23:36 +0300
Subject: vsp-lib: Replace vsp-runner script with a function from vsp-lib

This allows reusing variables internal to vsp-lib and getting rid of the
mdev and format arguments to the vsp-runner invocations.

As part of the transition, handle additional options with an explicit
list of supported options instead of passing them straight to yavta.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 tests/vsp-unit-test-0001.sh | 4 ++--
 tests/vsp-unit-test-0002.sh | 4 ++--
 tests/vsp-unit-test-0003.sh | 4 ++--
 tests/vsp-unit-test-0004.sh | 6 +++---
 tests/vsp-unit-test-0005.sh | 4 ++--
 tests/vsp-unit-test-0006.sh | 4 ++--
 tests/vsp-unit-test-0007.sh | 4 ++--
 tests/vsp-unit-test-0008.sh | 4 ++--
 tests/vsp-unit-test-0009.sh | 4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'tests')

diff --git a/tests/vsp-unit-test-0001.sh b/tests/vsp-unit-test-0001.sh
index 887f23a..1357363 100755
--- a/tests/vsp-unit-test-0001.sh
+++ b/tests/vsp-unit-test-0001.sh
@@ -17,8 +17,8 @@ test_wpf_packing() {
 	pipe_configure rpf-wpf 0 0
 	format_configure rpf-wpf 0 0 ARGB32 1024x768 $format
 
-	$vsp_runner $mdev input 0 ARGB32 &
-	$vsp_runner $mdev output 0 $format
+	vsp_runner rpf.0 &
+	vsp_runner wpf.0
 
 	result=$(compare_frames)
 
diff --git a/tests/vsp-unit-test-0002.sh b/tests/vsp-unit-test-0002.sh
index 35bb0ad..bc82b3c 100755
--- a/tests/vsp-unit-test-0002.sh
+++ b/tests/vsp-unit-test-0002.sh
@@ -17,8 +17,8 @@ test_wpf_packing() {
 	pipe_configure rpf-wpf 0 0
 	format_configure rpf-wpf 0 0 YUV444M 1024x768 $format
 
-	$vsp_runner $mdev input 0 YUV444M &
-	$vsp_runner $mdev output 0 $format
+	vsp_runner rpf.0 &
+	vsp_runner wpf.0
 
 	result=$(compare_frames)
 
diff --git a/tests/vsp-unit-test-0003.sh b/tests/vsp-unit-test-0003.sh
index 30bf2df..9a11d9f 100755
--- a/tests/vsp-unit-test-0003.sh
+++ b/tests/vsp-unit-test-0003.sh
@@ -20,8 +20,8 @@ test_scale() {
 	pipe_configure rpf-uds
 	format_configure rpf-uds $format $insize $format $outsize
 
-	$vsp_runner $mdev input 0 $format &
-	$vsp_runner $mdev output 0 $format
+	vsp_runner rpf.0 &
+	vsp_runner wpf.0
 
 	result=$(compare_frames)
 
diff --git a/tests/vsp-unit-test-0004.sh b/tests/vsp-unit-test-0004.sh
index f3a6811..396e053 100755
--- a/tests/vsp-unit-test-0004.sh
+++ b/tests/vsp-unit-test-0004.sh
@@ -16,9 +16,9 @@ test_histogram() {
 	pipe_configure rpf-hgo
 	format_configure rpf-hgo $format 1024x768
 
-	$vsp_runner $mdev hgo &
-	$vsp_runner $mdev input 0 $format &
-	$vsp_runner $mdev output 0 $format
+	vsp_runner hgo &
+	vsp_runner rpf.0 &
+	vsp_runner wpf.0
 
 	result=$(compare_histograms)
 
diff --git a/tests/vsp-unit-test-0005.sh b/tests/vsp-unit-test-0005.sh
index caf0c9c..9cb46c6 100755
--- a/tests/vsp-unit-test-0005.sh
+++ b/tests/vsp-unit-test-0005.sh
@@ -19,8 +19,8 @@ test_rpf() {
 	pipe_configure rpf-wpf $rpf 0
 	format_configure rpf-wpf $rpf 0 $format 1024x768 $format
 
-	$vsp_runner $mdev input $rpf $format &
-	$vsp_runner $mdev output 0 $format
+	vsp_runner rpf.$rpf &
+	vsp_runner wpf.0
 
 	result=$(compare_frames)
 
diff --git a/tests/vsp-unit-test-0006.sh b/tests/vsp-unit-test-0006.sh
index a7daad7..8e6a3fb 100755
--- a/tests/vsp-unit-test-0006.sh
+++ b/tests/vsp-unit-test-0006.sh
@@ -15,7 +15,7 @@ test_no_rpf() {
 	pipe_configure none
 	format_configure wpf $format 1024x768 0
 
-	$vsp_runner $mdev output 0 $format
+	vsp_runner wpf.0
 
 	# The test always passes if the kernel doesn't crash
 	test_complete pass
@@ -27,7 +27,7 @@ test_no_wpf() {
 	pipe_configure none
 	format_configure rpf $format 1024x768 0
 
-	$vsp_runner $mdev input 0 $format
+	vsp_runner rpf.0
 
 	# The test always passes if the kernel doesn't crash
 	test_complete pass
diff --git a/tests/vsp-unit-test-0007.sh b/tests/vsp-unit-test-0007.sh
index 8d86b66..3f769ab 100755
--- a/tests/vsp-unit-test-0007.sh
+++ b/tests/vsp-unit-test-0007.sh
@@ -19,9 +19,9 @@ test_bru() {
 	format_configure rpf-bru $format 1024x768 $ninputs
 
 	for input in `seq 0 1 $((ninputs-1))` ; do
-		$vsp_runner $mdev input $input $format &
+		vsp_runner rpf.$input &
 	done
-	$vsp_runner $mdev output 0 $format
+	vsp_runner wpf.0
 
 	result=$(compare_frames)
 
diff --git a/tests/vsp-unit-test-0008.sh b/tests/vsp-unit-test-0008.sh
index ef3e4c2..fb29b8d 100755
--- a/tests/vsp-unit-test-0008.sh
+++ b/tests/vsp-unit-test-0008.sh
@@ -27,8 +27,8 @@ test_scale() {
 	pipe_configure $pipe
 	format_configure $pipe $format $insize $format $outsize
 
-	$vsp_runner $mdev input 0 $format &
-	$vsp_runner $mdev output 0 $format
+	vsp_runner rpf.0 &
+	vsp_runner wpf.0
 
 	result=$(compare_frames)
 
diff --git a/tests/vsp-unit-test-0009.sh b/tests/vsp-unit-test-0009.sh
index 9741584..395e660 100755
--- a/tests/vsp-unit-test-0009.sh
+++ b/tests/vsp-unit-test-0009.sh
@@ -19,8 +19,8 @@ test_wpf() {
 	pipe_configure rpf-wpf 0 $wpf
 	format_configure rpf-wpf 0 $wpf $format 1024x768 $format
 
-	$vsp_runner $mdev input 0 $format &
-	$vsp_runner $mdev output $wpf $format
+	vsp_runner rpf.0 &
+	vsp_runner wpf.$wpf
 
 	result=$(compare_frames)
 
-- 
cgit v1.2.3