summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-21 14:33:10 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-12-21 14:33:10 +0000
commitf6f1ff9d851efde5d6a2c556ad6adfe5cd86375e (patch)
tree5baa9d51b58eac1b858f0205de37a4a8a17d6c87 /Build/source/texk
parent3dcdc887a16bca462dc75ab4ac28319b61802c5e (diff)
minor build fixes
git-svn-id: svn://tug.org/texlive/trunk@16470 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL5
-rw-r--r--Build/source/texk/xdvik/tests/test_string_utils.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 3b269da8c39..dd7ea8639eb 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2009-12-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tests/test_string_utils.c (test_my_stristr): Make test result
+ independent of compiler optimizations (constant folding).
+
2009-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/test_string_utils.c (test_expand_filename):
diff --git a/Build/source/texk/xdvik/tests/test_string_utils.c b/Build/source/texk/xdvik/tests/test_string_utils.c
index b3cb9a70cf4..0498524a661 100644
--- a/Build/source/texk/xdvik/tests/test_string_utils.c
+++ b/Build/source/texk/xdvik/tests/test_string_utils.c
@@ -163,14 +163,16 @@ static Boolean test_my_stristr(int verbose)
size_t i;
Boolean result = True;
for (i = 0; i < (sizeof tests / sizeof tests[0]); i++) {
+ char *res = my_stristr(tests[i].str1, tests[i].str2);
if (verbose) {
INFO((stderr, "my_stristr(%s, %s) -> %s == %s?\n",
tests[i].str1,
tests[i].str2,
- my_stristr(tests[i].str1, tests[i].str2),
+ res,
tests[i].result));
}
- if (my_stristr(tests[i].str1, tests[i].str2) != tests[i].result) {
+ if (res != tests[i].result &&
+ (res == NULL || tests[i].result == NULL || strcmp(res, tests[i].result))) {
result = False;
}
}