|
From: <sv...@va...> - 2012-08-03 20:28:28
|
florian 2012-08-03 21:28:21 +0100 (Fri, 03 Aug 2012)
New Revision: 12822
Log:
Fix testcase. Iterating over an array of invalid insns to test them all
does not work, as conversion will stop at the first invalid character.
So... need to loop over them.
Modified files:
trunk/none/tests/s390x/cu42.c
trunk/none/tests/s390x/cu42.stdout.exp
Modified: trunk/none/tests/s390x/cu42.stdout.exp (+41 -1)
===================================================================
--- trunk/none/tests/s390x/cu42.stdout.exp 2012-08-03 20:37:02 +01:00 (rev 12821)
+++ trunk/none/tests/s390x/cu42.stdout.exp 2012-08-03 21:28:21 +01:00 (rev 12822)
@@ -101,9 +101,49 @@
UTF16: <none>
cc = 2
dst address difference: 0 dst len: 2000
- src address difference: 0 src len: 44
+ src address difference: 0 src len: 4
UTF16: <none>
cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
+ dst address difference: 0 dst len: 2000
+ src address difference: 0 src len: 4
+UTF16: <none>
+ cc = 2
dst address difference: 0 dst len: 0
src address difference: 0 src len: 44
UTF16: <none>
Modified: trunk/none/tests/s390x/cu42.c (+11 -2)
===================================================================
--- trunk/none/tests/s390x/cu42.c 2012-08-03 20:37:02 +01:00 (rev 12821)
+++ trunk/none/tests/s390x/cu42.c 2012-08-03 21:28:21 +01:00 (rev 12822)
@@ -35,7 +35,7 @@
uint32_t invalid[] = {
0x0000d800, 0x0000dbff, /* corner cases */
0x00110000, 0xffffffff, /* corner cases */
- 0x0000daad, 0x0000d901, 0x0000dddd, /* misc */
+ 0x0000daad, 0x0000d901, 0x0000d8ff, /* misc */
0x00110011, 0x01000000, 0x10000000, 0xdeadbeef /* misc */
};
@@ -116,6 +116,8 @@
int main()
{
+ int i;
+
/* Length == 0, no memory should be read or written */
printf("\n------------- test1 ----------------\n");
run_test(NULL, 0, NULL, 0);
@@ -168,8 +170,15 @@
run_test(buff, 4, pattern2, 8);
/* Input contains invalid characters */
+
+ // As conversion stops upon encountering an invalid character, we
+ // need to test each invalid character separately, to make sure it
+ // is recognized as invalid.
+
printf("\n------------- test5 ----------------\n");
- run_test(buff, sizeof buff, invalid, sizeof invalid);
+ for (i = 0; i < sizeof invalid / 4; ++i) {
+ run_test(buff, sizeof buff, invalid + i, 4);
+ }
run_test(buff, 0, invalid, sizeof invalid); // cc = 2
run_test(buff, 100, invalid, sizeof invalid);
|