Add runtime test that strtok_r() bug fix works.

Our bug fix for glibc's strtok_r() bug was not effective in distribution
tarballs.  This new test should catch that problem earlier in case it
recurs.

diff --git a/tests/automake.mk b/tests/automake.mk
index 7659a268f2e94230400eaf39a4f704583d74607b..bd8a605f63478f21d97209c5bf488d56a3467f4e 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -66,6 +66,9 @@ noinst_PROGRAMS += tests/test-sha1
 tests_test_sha1_SOURCES = tests/test-sha1.c
 tests_test_sha1_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-strtok_r
+tests_test_strtok_r_SOURCES = tests/test-strtok_r.c
+
 noinst_PROGRAMS += tests/test-type-props
 tests_test_type_props_SOURCES = tests/test-type-props.c
 

diff --git a/tests/library.at b/tests/library.at
index c48828e9d00830b1778b5e91b55dadb67a217458..a9a5bea51b0f64a02fb4a9043acb18b516c2862c 100644 (file)
--- a/tests/library.at
+++ b/tests/library.at
@@ -37,3 +37,7 @@ AT_CLEANUP
 AT_SETUP([test vconn library])
 OVS_CHECK_LCOV([test-vconn], [0], [ignore])
 AT_CLEANUP
+
+AT_SETUP([test strtok_r bug fix])
+AT_CHECK([test-strtok_r], [0], [ignore])
+AT_CLEANUP

diff --git a/tests/test-strtok_r.c b/tests/test-strtok_r.c
new file mode 100644 (file)
index 0000000..9f8d898
--- /dev/null
+++ b/tests/test-strtok_r.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010 Nicira Networks.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <string.h>
+
+/* Some versions of glibc 2.7 has a bug in strtok_r when with optimization that
+ * can cause segfaults:
+ *      http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614.
+ *
+ * Open vSwitch works around this problem by supplying a replacement string.h.
+ * This test program verifies that the workaround is in place.
+ */
+int
+main(void)
+{
+    char string[] = ":::";
+    char *save_ptr = (char *) 0xc0ffee;
+    char *token1, *token2;
+    token1 = strtok_r(string, ":", &save_ptr);
+    token2 = strtok_r(NULL, ":", &save_ptr);
+    printf ("%s %s\n", token1, token2);
+    return 0;
+}