From 9f4687ed3d419ace23c9598bf2bd9ffd26fb855b Mon Sep 17 00:00:00 2001 From: Vasilis Kalintiris Date: Sat, 7 Dec 2013 14:33:39 +0200 Subject: [PATCH] Use do_run_from_file() for test_memcpy2 --- tests/core/test_memcpy2.in | 22 ++++++++++++++++++++++ tests/core/test_memcpy2.out | 1 + tests/test_core.py | 27 ++++----------------------- 3 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 tests/core/test_memcpy2.in create mode 100644 tests/core/test_memcpy2.out diff --git a/tests/core/test_memcpy2.in b/tests/core/test_memcpy2.in new file mode 100644 index 000000000..91e0b6a03 --- /dev/null +++ b/tests/core/test_memcpy2.in @@ -0,0 +1,22 @@ + + #include + #include + #include + int main() { + char buffer[256]; + for (int i = 0; i < 10; i++) { + for (int j = 0; j < 10; j++) { + for (int k = 0; k < 35; k++) { + for (int t = 0; t < 256; t++) buffer[t] = t; + char *dest = buffer + i + 128; + char *src = buffer+j; + //printf("%d, %d, %d\n", i, j, k); + assert(memcpy(dest, src, k) == dest); + assert(memcmp(dest, src, k) == 0); + } + } + } + printf("ok.\n"); + return 1; + } + \ No newline at end of file diff --git a/tests/core/test_memcpy2.out b/tests/core/test_memcpy2.out new file mode 100644 index 000000000..59f3f9845 --- /dev/null +++ b/tests/core/test_memcpy2.out @@ -0,0 +1 @@ +ok. \ No newline at end of file diff --git a/tests/test_core.py b/tests/test_core.py index 8ab5672eb..0f84c51f4 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -2534,29 +2534,10 @@ The current type of b is: 9 self.do_run_from_file(src, output, output_nicerizer = check) def test_memcpy2(self): - src = r''' - #include - #include - #include - int main() { - char buffer[256]; - for (int i = 0; i < 10; i++) { - for (int j = 0; j < 10; j++) { - for (int k = 0; k < 35; k++) { - for (int t = 0; t < 256; t++) buffer[t] = t; - char *dest = buffer + i + 128; - char *src = buffer+j; - //printf("%d, %d, %d\n", i, j, k); - assert(memcpy(dest, src, k) == dest); - assert(memcmp(dest, src, k) == 0); - } - } - } - printf("ok.\n"); - return 1; - } - ''' - self.do_run(src, 'ok.'); + test_path = path_from_root('tests', 'core', 'test_memcpy2') + src, output = (test_path + s for s in ('.in', '.out')) + + self.do_run_from_file(src, output) def test_getopt(self): if self.emcc_args is None: return self.skip('needs emcc for libc')