Hi,
please find attached the patch for v4l-test 0.4.
Changes:
Test cases for MAX_EM28XX_INPUT, MAX_EM28XX_TVNORMS removed as they might
have confusing results if the tests are not executed agains em28xx driver.
Some typos fixed.
Regards,
Márton Németh
Index: testcases/kernel/device-drivers/v4l/user_space/README
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/v4l/user_space/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- testcases/kernel/device-drivers/v4l/user_space/README 5 Jan 2009 07:25:21 -0000 1.2
+++ testcases/kernel/device-drivers/v4l/user_space/README 24 Jan 2009 21:29:59 -0000
@@ -4,6 +4,8 @@
Release History
---------------
+24 Jan 2009 0.4 Test cases for MAX_EM28XX_INPUT, MAX_EM28XX_TVNORMS removed;
+ some typos fixed
4 Jan 2008 0.3 Test cases for VIDIOC_ENUMOUTPUT, VIDIOC_ENUMAUDOUT,
VIDIOC_QUERYCTRL added;
New test cases for VIDIOC_ENUMAUDIO, VIDIOC_ENUM_FMT,
Index: testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMINPUT.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMINPUT.c,v
retrieving revision 1.2
diff -u -r1.2 test_VIDIOC_ENUMINPUT.c
--- testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMINPUT.c 5 Jan 2009 07:25:21 -0000 1.2
+++ testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMINPUT.c 24 Jan 2009 21:29:59 -0000
@@ -1,6 +1,8 @@
/*
* v4l-test: Test environment for Video For Linux Two API
*
+ * 18 Jan 2009 0.4 Test case for MAX_EM28XX_INPUT removed, test cases with
+ * U32_MAX and S32_MAX are enough
* 1 Jan 2009 0.3 Added index=S32_MAX and S32_MAX+1
* 22 Dec 2008 0.2 Test case with NULL parameter added
* 18 Dec 2008 0.1 First release
@@ -30,8 +32,6 @@
#include "test_VIDIOC_ENUMINPUT.h"
-#define MAX_EM28XX_INPUT 4
-
void test_VIDIOC_ENUMINPUT() {
int ret;
struct v4l2_input input;
@@ -131,7 +131,6 @@
CU_ASSERT_EQUAL(memcmp(&input, &input2, sizeof(input)), 0);
}
-
void test_VIDIOC_ENUMINPUT_U32_MAX() {
int ret;
struct v4l2_input input;
@@ -149,23 +148,6 @@
CU_ASSERT_EQUAL(memcmp(&input, &input2, sizeof(input)), 0);
}
-void test_VIDIOC_ENUMINPUT_3() {
- int ret;
- struct v4l2_input input;
- struct v4l2_input input2;
-
- memset(&input, 0xff, sizeof(input));
- input.index = MAX_EM28XX_INPUT+1;
- ret = ioctl(get_video_fd(), VIDIOC_ENUMINPUT, &input);
-
- CU_ASSERT_EQUAL(ret, -1);
- CU_ASSERT_EQUAL(errno, EINVAL);
-
- memset(&input2, 0xff, sizeof(input2));
- input2.index = MAX_EM28XX_INPUT+1;
- CU_ASSERT_EQUAL(memcmp(&input, &input2, sizeof(input)), 0);
-}
-
void test_VIDIOC_ENUMINPUT_NULL() {
int ret;
Index: testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMSTD.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMSTD.c,v
retrieving revision 1.2
diff -u -r1.2 test_VIDIOC_ENUMSTD.c
--- testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMSTD.c 5 Jan 2009 07:25:21 -0000 1.2
+++ testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_ENUMSTD.c 24 Jan 2009 21:30:00 -0000
@@ -1,6 +1,8 @@
/*
* v4l-test: Test environment for Video For Linux Two API
*
+ * 18 Jan 2009 0.4 Test case for MAX_EM28XX_TVNORMS removed, test cases for
+ * S32_MAX & U32_MAX are enough
* 1 Jan 2009 0.3 Added index=S32_MAX and S32_MAX+1
* 22 Dec 2008 0.2 Test case with NULL parameter added
* 18 Dec 2008 0.1 First release
@@ -35,8 +37,6 @@
#include "test_VIDIOC_ENUMSTD.h"
-#define MAX_EM28XX_TVNORMS 10
-
void test_VIDIOC_ENUMSTD() {
int ret;
struct v4l2_standard std;
@@ -150,24 +150,6 @@
CU_ASSERT_EQUAL(memcmp(&std, &std2, sizeof(std)), 0);
}
-
-void test_VIDIOC_ENUMSTD_3() {
- int ret;
- struct v4l2_standard std;
- struct v4l2_standard std2;
-
- memset(&std, 0xff, sizeof(std));
- std.index = MAX_EM28XX_TVNORMS;
- ret = ioctl(get_video_fd(), VIDIOC_ENUMSTD, &std);
-
- CU_ASSERT_EQUAL(ret, -1);
- CU_ASSERT_EQUAL(errno, EINVAL);
-
- memset(&std2, 0xff, sizeof(std2));
- std2.index = MAX_EM28XX_TVNORMS;
- CU_ASSERT_EQUAL(memcmp(&std, &std2, sizeof(std)), 0);
-}
-
void test_VIDIOC_ENUMSTD_NULL() {
int ret;
Index: testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_STD.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_STD.c,v
retrieving revision 1.2
diff -u -r1.2 test_VIDIOC_STD.c
--- testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_STD.c 5 Jan 2009 07:25:21 -0000 1.2
+++ testcases/kernel/device-drivers/v4l/user_space/test_VIDIOC_STD.c 24 Jan 2009 21:30:00 -0000
@@ -1,6 +1,7 @@
/*
* v4l-test: Test environment for Video For Linux Two API
*
+ * 18 Jan 2009 0.4 Typo corrected
* 23 Dec 2008 0.3 Debug messages added
* 22 Dec 2008 0.2 Test case with NULL parameter added
* 18 Dec 2008 0.1 First release
@@ -101,7 +102,7 @@
CU_ASSERT( (id & std_id) == id);
if (std_id != id) {
- dprintf("ret=%i, errno=%i, std_id=0x0x%llX, id=0x%llX\n", ret, errno, std_id, id);
+ dprintf("ret=%i, errno=%i, std_id=0x%llX, id=0x%llX\n", ret, errno, std_id, id);
}
}
Index: testcases/kernel/device-drivers/v4l/user_space/v4l2_test.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/v4l/user_space/v4l2_test.c,v
retrieving revision 1.2
diff -u -r1.2 v4l2_test.c
--- testcases/kernel/device-drivers/v4l/user_space/v4l2_test.c 5 Jan 2009 07:25:21 -0000 1.2
+++ testcases/kernel/device-drivers/v4l/user_space/v4l2_test.c 24 Jan 2009 21:30:00 -0000
@@ -1,6 +1,8 @@
/*
* v4l-test: Test environment for Video For Linux Two API
*
+ * 18 Jan 2009 0.5 Testa cases for MAX_EM28XX_INPUT and MAX_EM28XX_TVNORMS
+ * removed
* 1 Jan 2009 0.4 Test cases for VIDIOC_ENUMOUTPUT, VIDIOC_ENUMAUDOUT,
* VIDIOC_QUERYCTRL added;
* New test cases for VIDIOC_ENUMAUDIO, VIDIOC_ENUM_FMT,
@@ -84,7 +86,6 @@
{ "VIDIOC_ENUMINPUT, index=S32_MAX", test_VIDIOC_ENUMINPUT_S32_MAX },
{ "VIDIOC_ENUMINPUT, index=S32_MAX+1", test_VIDIOC_ENUMINPUT_S32_MAX_1 },
{ "VIDIOC_ENUMINPUT, index=U32_MAX", test_VIDIOC_ENUMINPUT_U32_MAX },
- { "VIDIOC_ENUMINPUT, index=MAX_EM28XX_INPUT", test_VIDIOC_ENUMINPUT_3 },
{ "VIDIOC_ENUMINPUT with NULL parameter", test_VIDIOC_ENUMINPUT_NULL },
{ "VIDIOC_ENUMOUTPUT", test_VIDIOC_ENUMOUTPUT },
@@ -97,7 +98,6 @@
{ "VIDIOC_ENUMSTD, index=S32_MAX", test_VIDIOC_ENUMSTD_S32_MAX },
{ "VIDIOC_ENUMSTD, index=S32_MAX+1", test_VIDIOC_ENUMSTD_S32_MAX_1 },
{ "VIDIOC_ENUMSTD, index=U32_MAX", test_VIDIOC_ENUMSTD_U32_MAX },
- { "VIDIOC_ENUMSTD, index=MAX_EM28XX_TVNORMS", test_VIDIOC_ENUMSTD_3 },
{ "VIDIOC_ENUMSTD with NULL parameter", test_VIDIOC_ENUMSTD_NULL },
{ "VIDIOC_QUERYCTRL", test_VIDIOC_QUERYCTRL },
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
