From a95fe92dafbd2a2e718bb4aac090a7156a46e79b Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 20 Sep 2022 15:44:16 -0700 Subject: Use `printf` in tests. (#2406) Co-authored-by: Yong He --- tests/cpu-program/class-com.slang | 5 +---- tests/cpu-program/class.slang | 5 +---- tests/cpu-program/cpu-hello-world.slang | 4 +--- tests/cpu-program/gfx-smoke.slang | 7 ++----- tests/cpu-program/gfx-smoke.slang.expected | 8 ++++---- tests/cpu-program/pointer-basics.slang | 7 ++----- tests/cpu-program/pointer-deref.slang | 7 ++----- 7 files changed, 13 insertions(+), 30 deletions(-) (limited to 'tests/cpu-program') diff --git a/tests/cpu-program/class-com.slang b/tests/cpu-program/class-com.slang index 3aec76818..e2812f586 100644 --- a/tests/cpu-program/class-com.slang +++ b/tests/cpu-program/class-com.slang @@ -1,7 +1,4 @@ //TEST:EXECUTABLE: -__target_intrinsic(cpp, "printf(\"%s\\n\", ($0).getBuffer())") -void writeln(String text); - [COM("BE18F5D2-4522-4AB0-A6EE-1D157FA2B083")] interface IFoo { @@ -17,7 +14,7 @@ class MyClass : IFoo } int method() { - writeln("method"); + printf("method\n"); return intMember; } }; diff --git a/tests/cpu-program/class.slang b/tests/cpu-program/class.slang index 1fc35aed0..1a510118a 100644 --- a/tests/cpu-program/class.slang +++ b/tests/cpu-program/class.slang @@ -1,7 +1,4 @@ //TEST:EXECUTABLE: -__target_intrinsic(cpp, "printf(\"%s\\n\", ($0).getBuffer())") -void writeln(String text); - class MyClass { int intMember; @@ -11,7 +8,7 @@ class MyClass } int method() { - writeln("method"); + printf("method\n"); return intMember; } } diff --git a/tests/cpu-program/cpu-hello-world.slang b/tests/cpu-program/cpu-hello-world.slang index 9385b239c..f91e354bc 100644 --- a/tests/cpu-program/cpu-hello-world.slang +++ b/tests/cpu-program/cpu-hello-world.slang @@ -1,9 +1,7 @@ //TEST:EXECUTABLE: -__target_intrinsic(cpp, "printf(\"%s\\n\", ($0).getBuffer())") -void writeln(String text); public __extern_cpp int main() { - writeln("Hello World."); + printf("Hello World.\n"); return 0; } \ No newline at end of file diff --git a/tests/cpu-program/gfx-smoke.slang b/tests/cpu-program/gfx-smoke.slang index 37beede7e..d0acb83db 100644 --- a/tests/cpu-program/gfx-smoke.slang +++ b/tests/cpu-program/gfx-smoke.slang @@ -1,7 +1,4 @@ //TEST:EXECUTABLE: -__target_intrinsic(cpp, "printf(\"%s\\n\", ($0).getBuffer())") -void writeln(String text); - import gfx; import slang; @@ -13,7 +10,7 @@ public __extern_cpp int main() gfx.gfxCreateDevice(&deviceDesc, device); if (device == none) { - writeln("fail"); + printf("fail\n"); return -1; } @@ -98,7 +95,7 @@ public __extern_cpp int main() for (int i = 0; i < 4; i++) { float val = ((float *)blob.value.getBufferPointer())[i]; - writeln(String(val)); + printf("%.1f\n", val); } return 0; } \ No newline at end of file diff --git a/tests/cpu-program/gfx-smoke.slang.expected b/tests/cpu-program/gfx-smoke.slang.expected index aa0dd7680..bf03b7741 100644 --- a/tests/cpu-program/gfx-smoke.slang.expected +++ b/tests/cpu-program/gfx-smoke.slang.expected @@ -2,8 +2,8 @@ result code = 0 standard error = { } standard output = { -0 -1 -2 -3 +0.0 +1.0 +2.0 +3.0 } diff --git a/tests/cpu-program/pointer-basics.slang b/tests/cpu-program/pointer-basics.slang index 3054cda1c..e38d866eb 100644 --- a/tests/cpu-program/pointer-basics.slang +++ b/tests/cpu-program/pointer-basics.slang @@ -1,7 +1,4 @@ //TEST:EXECUTABLE: -__target_intrinsic(cpp, "printf(\"%s\\n\", ($0).getBuffer())") -void writeln(String text); - public __extern_cpp int main() { uint2 value; @@ -19,8 +16,8 @@ public __extern_cpp int main() && ptrVal != 0 && value[0] == 3 && pValue[1] == 1) - writeln("Success"); + printf("Success\n"); else - writeln("Fail"); + printf("Fail\n"); return 0; } \ No newline at end of file diff --git a/tests/cpu-program/pointer-deref.slang b/tests/cpu-program/pointer-deref.slang index 34c6ba97f..79f1b2cd0 100644 --- a/tests/cpu-program/pointer-deref.slang +++ b/tests/cpu-program/pointer-deref.slang @@ -1,7 +1,4 @@ //TEST:EXECUTABLE: -__target_intrinsic(cpp, "printf(\"%s\\n\", ($0).getBuffer())") -void writeln(String text); - struct SubRecord { int field2; @@ -23,11 +20,11 @@ public __extern_cpp int main() pRec.sub.field3 = 3.0f; if (rec.field == 1 && rec.sub.field2 == 2 && pRec.sub.field3 == 3.0f) { - writeln("success"); + printf("success\n"); } else { - writeln("fail"); + printf("fail\n"); } return 0; } \ No newline at end of file -- cgit v1.2.3