diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-05-03 13:30:41 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-05-03 13:30:41 -0700 |
commit | 40a5c44d6626d74db4f56ae621b765adafbe8131 (patch) | |
tree | b51c4085aeb5a8b247157711fa79a6ce1e0ed361 /tests | |
parent | 2b9c02e72a06486fb6fb2edbd9d8141fde9ec700 (diff) | |
parent | 4bdc1b05e88e5eb51695a3325d07577d8fda46ed (diff) |
Merge branch 'strcat-fix' of github.com:fairfieldt/emscripten into fairfieldt-strcat-fix
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/runner.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index c14197f4..0aefb8e1 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -2051,8 +2051,9 @@ Succeeded! char *two = "fa la sa ho fi FI FO FUM WHEN WHERE WHY HOW WHO"; char three[1000]; strcpy(three, &one[argc*2]); - strcat(three, &two[argc*3]); + char *four = strcat(three, &two[argc*3]); printf("cat |%s|\\n", three); + printf("returned |%s|\\n", four); } return 0; @@ -2062,7 +2063,8 @@ Succeeded! print named Settings.NAMED_GLOBALS = named self.do_run(src, '''4:10,177,543,def\n4\nwowie\ntoo\n76\n5\n(null)\n/* a comment */\n// another\ntest\nwaka ....e 1 O...wo 2 T................................ -cat |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO|''', ['wowie', 'too', '74']) +cat |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO| +returned |umber one top notchfi FI FO FUM WHEN WHERE WHY HOW WHO|''', ['wowie', 'too', '74']) if self.emcc_args == []: gen = open(self.in_dir('src.cpp.o.js')).read() assert ('var __str1;' in gen) == named |