Merge branch '1.2'

Conflicts: configure.ac
2010-03-28 21:44:41 +03:00
parent 49880cbabe 024106bbfb
commit 4e63fcd55d
26 changed files with 147 additions and 23 deletions
--- a/test/suites/invalid-strip/escaped-null-byte-in-string/error
+++ b/test/suites/invalid-strip/escaped-null-byte-in-string/error
@@ -0,0 +1,2 @@
+1
+\u0000 is not allowed
--- a/test/suites/invalid-strip/escaped-null-byte-in-string/input
+++ b/test/suites/invalid-strip/escaped-null-byte-in-string/input
@@ -0,0 +1 @@
+["\u0000 (null byte not allowed)"]
--- a/test/suites/invalid-strip/null-byte-in-string/error
+++ b/test/suites/invalid-strip/null-byte-in-string/error
@@ -1,2 +1,2 @@
 1
-\u0000 is not allowed
+control character 0x0 near '"null byte '
--- a/test/suites/invalid-strip/null-byte-in-string/input
+++ b/test/suites/invalid-strip/null-byte-in-string/input
--- a/test/suites/invalid-strip/null-byte-outside-string/error
+++ b/test/suites/invalid-strip/null-byte-outside-string/error
@@ -0,0 +1,2 @@
+1
+invalid token near end of file
--- a/test/suites/invalid-strip/null-byte-outside-string/input
+++ b/test/suites/invalid-strip/null-byte-outside-string/input
--- a/test/suites/invalid-strip/real-underflow/error
+++ b/test/suites/invalid-strip/real-underflow/error
@@ -1,2 +0,0 @@
-1
-real number underflow near '123e-10000000'
--- a/test/suites/invalid/escaped-null-byte-in-string/error
+++ b/test/suites/invalid/escaped-null-byte-in-string/error
@@ -0,0 +1,2 @@
+1
+\u0000 is not allowed
--- a/test/suites/invalid/escaped-null-byte-in-string/input
+++ b/test/suites/invalid/escaped-null-byte-in-string/input
@@ -0,0 +1 @@
+["\u0000 (null byte not allowed)"]
--- a/test/suites/invalid/null-byte-in-string/error
+++ b/test/suites/invalid/null-byte-in-string/error
@@ -1,2 +1,2 @@
 1
-\u0000 is not allowed
+control character 0x0 near '"null byte '
--- a/test/suites/invalid/null-byte-in-string/input
+++ b/test/suites/invalid/null-byte-in-string/input
--- a/test/suites/invalid/null-byte-outside-string/error
+++ b/test/suites/invalid/null-byte-outside-string/error
@@ -0,0 +1,2 @@
+1
+invalid token near end of file
--- a/test/suites/invalid/null-byte-outside-string/input
+++ b/test/suites/invalid/null-byte-outside-string/input
--- a/test/suites/invalid/real-underflow/error
+++ b/test/suites/invalid/real-underflow/error
@@ -1,2 +0,0 @@
-1
-real number underflow near '123e-10000000'
--- a/test/suites/invalid-strip/real-underflow/input
+++ b/test/suites/invalid-strip/real-underflow/input
--- a/test/suites/valid-strip/real-underflow/output
+++ b/test/suites/valid-strip/real-underflow/output
@@ -0,0 +1 @@
+[0.0]
--- a/test/suites/invalid/real-underflow/input
+++ b/test/suites/invalid/real-underflow/input
--- a/test/suites/valid/real-underflow/output
+++ b/test/suites/valid/real-underflow/output
@@ -0,0 +1 @@
+[0.0]