Skip to content

Commit 3e41d69

Browse files
csyonghecsyonghe
authored
Run vk tests on spirv backend with expected failure list. (shader-slang#3128)
1 parent eaeb7cf commit 3e41d69

13 files changed

+297
-31
lines changed

‎.github/workflows/windows-selfhosted.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ jobs:
3636
.\make-slang-tag-version.bat
3737
3838
MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12
39+
- name: test-spirv-direct
40+
run: |
41+
set PATH=%PATH%;.\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\
42+
".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\slang-test.exe" tests/ -use-test-server -emit-spirv-directly -expected-failure-list tests/expected-failure.txt -api vk 2>&1
43+
shell: cmd
3944
- name: test
4045
run: |
41-
$slangTestBinDir = ".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\";
42-
$spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\";
43-
$env:Path += ";$slangTestBinDir;$spirvToolsBinDir";
44-
& "$slangTestBinDir\slang-test.exe" -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} -api all-cpu 2>&1;
46+
set PATH=%PATH%;.\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\
47+
".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\slang-test.exe" -use-test-server -api vk 2>&1
48+
shell: cmd

‎source/core/slang-process-util.cpp

+12-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ static String _getText(const ConstArrayView<Byte>& bytes)
5757
const auto preCount = _getCount(outStdOut) + _getCount(outStdError);
5858

5959
SLANG_RETURN_ON_FAIL(StreamUtil::readOrDiscard(stdOutStream, 0, outStdOut));
60-
SLANG_RETURN_ON_FAIL(StreamUtil::readOrDiscard(stdErrorStream, 0, outStdError));
60+
if (stdErrorStream)
61+
SLANG_RETURN_ON_FAIL(StreamUtil::readOrDiscard(stdErrorStream, 0, outStdError));
6162

6263
const auto postCount = _getCount(outStdOut) + _getCount(outStdError);
6364

@@ -69,9 +70,16 @@ static String _getText(const ConstArrayView<Byte>& bytes)
6970
}
7071

7172
// Read anything remaining
72-
SLANG_RETURN_ON_FAIL(StreamUtil::readOrDiscardAll(stdOutStream, 0, outStdOut));
73-
SLANG_RETURN_ON_FAIL(StreamUtil::readOrDiscardAll(stdErrorStream, 0, outStdError));
74-
73+
for(;;)
74+
{
75+
const auto preCount = _getCount(outStdOut) + _getCount(outStdError);
76+
StreamUtil::readOrDiscard(stdOutStream, 0, outStdOut);
77+
if (stdErrorStream)
78+
StreamUtil::readOrDiscard(stdErrorStream, 0, outStdError);
79+
const auto postCount = _getCount(outStdOut) + _getCount(outStdError);
80+
if (preCount == postCount)
81+
break;
82+
}
7583
return SLANG_OK;
7684
}
7785

‎source/core/slang-process.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Process : public RefObject
2323
{
2424
// Ignored on non-Windows platforms
2525
AttachDebugger = 0x01,
26+
DisableStdErrRedirection = 0x02
2627
};
2728
};
2829

‎source/core/windows/slang-win-process.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,11 @@ void WinProcess::kill(int32_t returnCode)
419419
WinHandle childStdInWriteTmp;
420420
// create stdout pipe for child process
421421
SLANG_RETURN_FAIL_ON_FALSE(CreatePipe(childStdOutReadTmp.writeRef(), childStdOutWrite.writeRef(), &securityAttributes, bufferSize));
422-
// create stderr pipe for child process
423-
SLANG_RETURN_FAIL_ON_FALSE(CreatePipe(childStdErrReadTmp.writeRef(), childStdErrWrite.writeRef(), &securityAttributes, bufferSize));
422+
if ((flags & Process::Flag::DisableStdErrRedirection) == 0)
423+
{
424+
// create stderr pipe for child process
425+
SLANG_RETURN_FAIL_ON_FALSE(CreatePipe(childStdErrReadTmp.writeRef(), childStdErrWrite.writeRef(), &securityAttributes, bufferSize));
426+
}
424427
// create stdin pipe for child process
425428
SLANG_RETURN_FAIL_ON_FALSE(CreatePipe(childStdInRead.writeRef(), childStdInWriteTmp.writeRef(), &securityAttributes, bufferSize));
426429

@@ -431,7 +434,8 @@ void WinProcess::kill(int32_t returnCode)
431434
// create a non-inheritable duplicate of the stdout reader
432435
SLANG_RETURN_FAIL_ON_FALSE(DuplicateHandle(currentProcess, childStdOutReadTmp, currentProcess, childStdOutRead.writeRef(), 0, FALSE, DUPLICATE_SAME_ACCESS));
433436
// create a non-inheritable duplicate of the stderr reader
434-
SLANG_RETURN_FAIL_ON_FALSE(DuplicateHandle(currentProcess, childStdErrReadTmp, currentProcess, childStdErrRead.writeRef(), 0, FALSE, DUPLICATE_SAME_ACCESS));
437+
if (childStdErrReadTmp)
438+
SLANG_RETURN_FAIL_ON_FALSE(DuplicateHandle(currentProcess, childStdErrReadTmp, currentProcess, childStdErrRead.writeRef(), 0, FALSE, DUPLICATE_SAME_ACCESS));
435439
// create a non-inheritable duplicate of the stdin writer
436440
SLANG_RETURN_FAIL_ON_FALSE(DuplicateHandle(currentProcess, childStdInWriteTmp, currentProcess, childStdInWrite.writeRef(), 0, FALSE, DUPLICATE_SAME_ACCESS));
437441
}
@@ -522,7 +526,8 @@ void WinProcess::kill(int32_t returnCode)
522526
}
523527

524528
RefPtr<Stream> streams[Index(StdStreamType::CountOf)];
525-
streams[Index(StdStreamType::ErrorOut)] = new WinPipeStream(childStdErrRead.detach(), FileAccess::Read);
529+
if (childStdErrRead)
530+
streams[Index(StdStreamType::ErrorOut)] = new WinPipeStream(childStdErrRead.detach(), FileAccess::Read);
526531
streams[Index(StdStreamType::Out)] = new WinPipeStream(childStdOutRead.detach(), FileAccess::Read);
527532
streams[Index(StdStreamType::In)] = new WinPipeStream(childStdInWrite.detach(), FileAccess::Write);
528533

‎test.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
& ".\bin\windows-x64\release\slang-test.exe" tests/ -use-test-server -emit-spirv-directly -expected-failure-list tests/expected-failure.txt -api vk 2>&1;

‎tests/expected-failure.txt

+179
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
tests/autodiff/array-param.slang.1 (vk)
2+
tests/autodiff/bool-return-control-flow.slang.1 (vk)
3+
tests/autodiff/dynamic-dispatch-generic-member-2.slang.1 (vk)
4+
tests/autodiff/dynamic-object-bwd-diff.slang.1 (vk)
5+
tests/autodiff/float-cast.slang.1 (vk)
6+
tests/autodiff/fwd-array-out-param.slang.1 (vk)
7+
tests/autodiff/global-param-hoisting.slang.1 (vk)
8+
tests/autodiff/high-order-backward-diff-3.slang.2 (vk)
9+
tests/autodiff/high-order-backward-diff-4.slang.2 (vk)
10+
tests/autodiff/high-order-builtins-2.slang.2 (vk)
11+
tests/autodiff/long-loop-branching-addition.slang.1 (vk)
12+
tests/autodiff/long-loop-chained-addition.slang.1 (vk)
13+
tests/autodiff/long-loop-multiple.slang.1 (vk)
14+
tests/autodiff/long-loop-noninductive.slang.1 (vk)
15+
tests/autodiff/long-loop.slang.1 (vk)
16+
tests/autodiff/long-while-loop.slang.1 (vk)
17+
tests/autodiff/matrix-arithmetic-fwd.slang.1 (vk)
18+
tests/autodiff/nested-jvp.slang.1 (vk)
19+
tests/autodiff/reverse-addr-eliminate.slang.1 (vk)
20+
tests/autodiff/reverse-array-out-param.slang.1 (vk)
21+
tests/autodiff/reverse-continue-loop.slang.1 (vk)
22+
tests/autodiff/reverse-control-flow-3.slang (vk)
23+
tests/autodiff/reverse-do-while.slang.1 (vk)
24+
tests/autodiff/reverse-hybrid-control-flow.slang.1 (vk)
25+
tests/autodiff/reverse-inout-param-1.slang.1 (vk)
26+
tests/autodiff/reverse-inout-param-2.slang.1 (vk)
27+
tests/autodiff/reverse-loop.slang.1 (vk)
28+
tests/autodiff/reverse-matrix-ops.slang.1 (vk)
29+
tests/autodiff/reverse-more-loops.slang (vk)
30+
tests/autodiff/reverse-nested-loop.slang.1 (vk)
31+
tests/autodiff/reverse-switch-case.slang.1 (vk)
32+
tests/autodiff/reverse-vector-arithmetic.slang.1 (vk)
33+
tests/autodiff/reverse-while-loop-2.slang.1 (vk)
34+
tests/autodiff/reverse-while-loop.slang.1 (vk)
35+
tests/autodiff/select.slang.1 (vk)
36+
tests/autodiff/bsdf/bsdf-sample.slang (vk)
37+
tests/autodiff/material/diff-bwd-falcor-material-system.slang (vk)
38+
tests/autodiff/material/diff-falcor-material-system.slang (vk)
39+
tests/autodiff/material2/diff-bwd-falcor-material-system.slang (vk)
40+
tests/autodiff/material2/diff-falcor-material-system.slang (vk)
41+
tests/autodiff/path-tracer/pt-loop.slang.1 (vk)
42+
tests/autodiff-dstdlib/determinant.slang (vk)
43+
tests/autodiff-dstdlib/dstdlib-abs.slang (vk)
44+
tests/autodiff-dstdlib/dstdlib-max.slang (vk)
45+
tests/autodiff-dstdlib/dstdlib-mul-mat-mat.slang (vk)
46+
tests/autodiff-dstdlib/dstdlib-mul-mat-vec.slang (vk)
47+
tests/autodiff-dstdlib/dstdlib-mul-vec-mat.slang (vk)
48+
tests/autodiff-dstdlib/dstdlib-sqrt.slang (vk)
49+
tests/autodiff-dstdlib/vector-length.slang (vk)
50+
tests/bugs/atomic-coerce.slang.1 (vk)
51+
tests/bugs/bool-op.slang.1 (vk)
52+
tests/bugs/buffer-swizzle-store.slang.1 (vk)
53+
tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk)
54+
tests/bugs/dxbc-double-problem.slang.1 (vk)
55+
tests/bugs/generic-type-duplication.slang.1 (vk)
56+
tests/bugs/gh-3075.slang.2 (vk)
57+
tests/bugs/glsl-static-const-array.slang (vk)
58+
tests/bugs/loop-optimize.slang.1 (vk)
59+
tests/bugs/matrix-reshape.slang.1 (vk)
60+
tests/bugs/nested-switch.slang.1 (vk)
61+
tests/bugs/parameter-block-load.slang (vk)
62+
tests/bugs/string-inline.slang.4 (vk)
63+
tests/bugs/vec-compare.slang.2 (vk)
64+
tests/bugs/vec-init.slang.2 (vk)
65+
tests/bugs/inlining/global-const-inline.slang.1 (vk)
66+
tests/compute/buffer-layout.slang.2 (vk)
67+
tests/compute/byte-address-buffer.slang.2 (vk)
68+
tests/compute/column-major.slang.3 (vk)
69+
tests/compute/dynamic-dispatch-13.slang.2 (vk)
70+
tests/compute/dynamic-dispatch-14.slang.3 (vk)
71+
tests/compute/dynamic-dispatch-16.slang (vk)
72+
tests/compute/dynamic-dispatch-17.slang (vk)
73+
tests/compute/dynamic-dispatch-18.slang.2 (vk)
74+
tests/compute/entry-point-uniform-params.slang.2 (vk)
75+
tests/compute/frem.slang.2 (vk)
76+
tests/compute/func-cbuffer-param.slang.2 (vk)
77+
tests/compute/half-calc.slang.1 (vk)
78+
tests/compute/half-rw-texture-convert.slang.4 (vk)
79+
tests/compute/half-rw-texture-convert2.slang.4 (vk)
80+
tests/compute/half-structured-buffer.slang (vk)
81+
tests/compute/half-vector-calc.slang.1 (vk)
82+
tests/compute/half-vector-compare.slang.1 (vk)
83+
tests/compute/interface-shader-param-in-struct.slang.2 (vk)
84+
tests/compute/kernel-context-threading.slang.5 (vk)
85+
tests/compute/loop-unroll.slang.5 (vk)
86+
tests/compute/non-square-column-major.slang.3 (vk)
87+
tests/compute/non-square-row-major.slang.3 (vk)
88+
tests/compute/pack-any-value-16bit.slang (vk)
89+
tests/compute/parameter-block.slang.2 (vk)
90+
tests/compute/ray-tracing-inline.slang.1 (vk)
91+
tests/compute/row-major.slang.3 (vk)
92+
tests/compute/rw-texture-simple.slang.4 (vk)
93+
tests/compute/semantic.slang.3 (vk)
94+
tests/compute/static-const-array.slang.1 (vk)
95+
tests/compute/static-const-matrix-array.slang.1 (vk)
96+
tests/compute/static-const-vector-array.slang.1 (vk)
97+
tests/compute/structured-buffer-of-matrices.slang.3 (vk)
98+
tests/compute/texture-sample-grad-offset-clamp.slang (vk)
99+
tests/compute/texture-simple.slang.4 (vk)
100+
tests/compute/texture-simpler.slang (vk)
101+
tests/compute/vector-scalar-compare.slang.1 (vk)
102+
tests/cross-compile/fmod.slang.1 (vk)
103+
tests/cross-compile/get-dimensions.slang.1 (vk)
104+
tests/cross-compile/glsl-bool-ops.slang.1 (vk)
105+
tests/hlsl/byte-buffer-load-std430.slang (vk)
106+
tests/hlsl/glsl-matrix-layout.slang (vk)
107+
tests/hlsl/packoffset.slang.1 (vk)
108+
tests/hlsl-intrinsic/asfloat16.slang.3 (vk)
109+
tests/hlsl-intrinsic/bit-cast-double.slang.3 (vk)
110+
tests/hlsl-intrinsic/classify-double.slang.3 (vk)
111+
tests/hlsl-intrinsic/classify-float.slang.3 (vk)
112+
tests/hlsl-intrinsic/f16tof32.slang.3 (vk)
113+
tests/hlsl-intrinsic/f32tof16.slang.3 (vk)
114+
tests/hlsl-intrinsic/literal-int64.slang.4 (vk)
115+
tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang.4 (vk)
116+
tests/hlsl-intrinsic/scalar-double-simple.slang.4 (vk)
117+
tests/hlsl-intrinsic/scalar-double-vk-intrinsic.slang.1 (vk)
118+
tests/hlsl-intrinsic/scalar-float.slang.3 (vk)
119+
tests/hlsl-intrinsic/scalar-int.slang.3 (vk)
120+
tests/hlsl-intrinsic/scalar-int64.slang.4 (vk)
121+
tests/hlsl-intrinsic/scalar-uint.slang.3 (vk)
122+
tests/hlsl-intrinsic/scalar-uint64.slang.4 (vk)
123+
tests/hlsl-intrinsic/vector-double-reduced-intrinsic.slang.3 (vk)
124+
tests/hlsl-intrinsic/vector-float.slang.3 (vk)
125+
tests/hlsl-intrinsic/vector-int-runtime-index.slang.3 (vk)
126+
tests/hlsl-intrinsic/vector-int.slang.3 (vk)
127+
tests/hlsl-intrinsic/wave-active-count-bits.slang.3 (vk)
128+
tests/hlsl-intrinsic/wave-active-product.slang.3 (vk)
129+
tests/hlsl-intrinsic/wave-broadcast-lane-at-vk.slang.1 (vk)
130+
tests/hlsl-intrinsic/wave-diverge.slang.3 (vk)
131+
tests/hlsl-intrinsic/wave-equality.slang.3 (vk)
132+
tests/hlsl-intrinsic/wave-get-lane-index.slang.3 (vk)
133+
tests/hlsl-intrinsic/wave-is-first-lane.slang.3 (vk)
134+
tests/hlsl-intrinsic/wave-prefix-count-bits.slang.3 (vk)
135+
tests/hlsl-intrinsic/wave-prefix-product.slang.3 (vk)
136+
tests/hlsl-intrinsic/wave-prefix-sum.slang.3 (vk)
137+
tests/hlsl-intrinsic/wave-read-lane-at-vk.slang.1 (vk)
138+
tests/hlsl-intrinsic/wave-shuffle-vk.slang.3 (vk)
139+
tests/hlsl-intrinsic/wave-vector.slang.3 (vk)
140+
tests/hlsl-intrinsic/wave.slang.3 (vk)
141+
tests/hlsl-intrinsic/active-mask/switch.slang.3 (vk)
142+
tests/hlsl-intrinsic/bit-cast/bit-cast-16-bit.slang.1 (vk)
143+
tests/hlsl-intrinsic/byte-address-buffer/byte-address-16bit-vector.slang.2 (vk)
144+
tests/hlsl-intrinsic/byte-address-buffer/byte-address-16bit.slang.2 (vk)
145+
tests/hlsl-intrinsic/byte-address-buffer/byte-address-struct.slang.3 (vk)
146+
tests/hlsl-intrinsic/size-of/align-of-3.slang.3 (vk)
147+
tests/hlsl-intrinsic/size-of/size-of-3.slang.3 (vk)
148+
tests/hlsl-intrinsic/wave-mask/wave-active-product.slang.3 (vk)
149+
tests/hlsl-intrinsic/wave-mask/wave-broadcast-lane-at-vk.slang.1 (vk)
150+
tests/hlsl-intrinsic/wave-mask/wave-diverge.slang.3 (vk)
151+
tests/hlsl-intrinsic/wave-mask/wave-equality.slang.3 (vk)
152+
tests/hlsl-intrinsic/wave-mask/wave-get-active.slang.3 (vk)
153+
tests/hlsl-intrinsic/wave-mask/wave-get-converged.slang.3 (vk)
154+
tests/hlsl-intrinsic/wave-mask/wave-is-first-lane.slang.3 (vk)
155+
tests/hlsl-intrinsic/wave-mask/wave-prefix-product.slang.3 (vk)
156+
tests/hlsl-intrinsic/wave-mask/wave-prefix-sum.slang.3 (vk)
157+
tests/hlsl-intrinsic/wave-mask/wave-read-lane-at-vk.slang.1 (vk)
158+
tests/hlsl-intrinsic/wave-mask/wave-shuffle-vk.slang.3 (vk)
159+
tests/hlsl-intrinsic/wave-mask/wave-vector.slang.3 (vk)
160+
tests/hlsl-intrinsic/wave-mask/wave.slang.3 (vk)
161+
tests/ir/loop-unroll-0.slang.1 (vk)
162+
tests/ir/string-literal-hash.slang.1 (vk)
163+
tests/language-feature/general-inline.slang.1 (vk)
164+
tests/language-feature/simple-inline.slang.1 (vk)
165+
tests/language-feature/initializer-lists/default-init-16bit-types.slang (vk)
166+
tests/language-feature/shader-params/interface-shader-param-ordinary.slang.2 (vk)
167+
tests/language-feature/swizzles/matrix-swizzle-write-array.slang.1 (vk)
168+
tests/language-feature/swizzles/matrix-swizzle-write-single.slang.1 (vk)
169+
tests/language-feature/swizzles/matrix-swizzle-write-swizzle.slang.1 (vk)
170+
tests/language-feature/swizzles/matrix-swizzle-write.slang.1 (vk)
171+
tests/optimization/func-resource-result/func-resource-result-complex.slang.1 (vk)
172+
tests/slang-extension/atomic-float-byte-address-buffer.slang.2 (vk)
173+
tests/slang-extension/atomic-int64-byte-address-buffer.slang.4 (vk)
174+
tests/slang-extension/atomic-min-max-u64-byte-address-buffer.slang.4 (vk)
175+
tests/slang-extension/cas-int64-byte-address-buffer.slang.4 (vk)
176+
tests/slang-extension/exchange-int64-byte-address-buffer.slang.4 (vk)
177+
tests/slang-extension/realtime-clock.slang.2 (vk)
178+
tests/spirv/spirv-instruction.slang (vk)
179+
tests/type/texture-sampler/texture-sampler-2d.slang (vk)

‎tools/slang-test/options.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "../../source/core/slang-string-util.h"
55
#include "../../source/core/slang-io.h"
6-
76
#include <stdio.h>
87
#include <stdlib.h>
98

@@ -291,6 +290,27 @@ static bool _isSubCommand(const char* arg)
291290
{
292291
optionsOut->skipApiDetection = true;
293292
}
293+
else if (strcmp(arg, "-emit-spirv-directly") == 0)
294+
{
295+
optionsOut->emitSPIRVDirectly = true;
296+
}
297+
else if (strcmp(arg, "-expected-failure-list") == 0)
298+
{
299+
if (argCursor == argEnd)
300+
{
301+
stdError.print("error: expected operand for '%s'\n", arg);
302+
return SLANG_FAIL;
303+
}
304+
auto fileName = *argCursor++;
305+
String text;
306+
File::readAllText(fileName, text);
307+
List<UnownedStringSlice> lines;
308+
StringUtil::split(text.getUnownedSlice(), '\n', lines);
309+
for (auto line : lines)
310+
{
311+
optionsOut->expectedFailureList.add(line);
312+
}
313+
}
294314
else
295315
{
296316
stdError.print("unknown option '%s'\n", arg);

‎tools/slang-test/options.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ struct Options
113113
Slang::String adapter;
114114

115115
// Maximum number of test servers to run.
116-
int serverCount = 4;
116+
int serverCount = 1;
117+
118+
bool emitSPIRVDirectly = false;
119+
120+
Slang::HashSet<Slang::String> expectedFailureList;
117121

118122
/// Parse the args, report any errors into stdError, and write the results into optionsOut
119123
static SlangResult parse(int argc, char** argv, TestCategorySet* categorySet, Slang::WriterHelper stdError, Options* optionsOut);

‎tools/slang-test/slang-test-main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2992,6 +2992,10 @@ static void _addRenderTestOptions(const Options& options, CommandLine& ioCmdLine
29922992
ioCmdLine.addArg("-adapter");
29932993
ioCmdLine.addArg(options.adapter);
29942994
}
2995+
if (options.emitSPIRVDirectly)
2996+
{
2997+
ioCmdLine.addArg("-emit-spirv-directly");
2998+
}
29952999
}
29963000

29973001
static SlangResult _extractProfileTime(const UnownedStringSlice& text, double& timeOut)
@@ -4117,7 +4121,7 @@ void runTestsInDirectory(
41174121
auto threadFunc = [&](int threadId)
41184122
{
41194123
TestReporter reporter;
4120-
reporter.init(context->options.outputMode, true);
4124+
reporter.init(context->options.outputMode, context->options.expectedFailureList, true);
41214125
TestReporter::SuiteScope suiteScope(&reporter, "tests");
41224126
context->setThreadIndex(threadId);
41234127
context->setTestReporter(&reporter);
@@ -4275,10 +4279,6 @@ static SlangResult runUnitTestModule(TestContext* context, TestOptions& testOpti
42754279

42764280
SlangResult innerMain(int argc, char** argv)
42774281
{
4278-
// Disable buffering for out and std out
4279-
StreamUtil::setStreamBufferStyle(StdStreamType::Out, StreamBufferStyle::None);
4280-
StreamUtil::setStreamBufferStyle(StdStreamType::ErrorOut, StreamBufferStyle::None);
4281-
42824282
auto stdWriters = StdWriters::initDefaultSingleton();
42834283

42844284
// The context holds useful things used during testing
@@ -4457,7 +4457,7 @@ SlangResult innerMain(int argc, char** argv)
44574457
{
44584458
// Setup the reporter
44594459
TestReporter reporter;
4460-
SLANG_RETURN_ON_FAIL(reporter.init(options.outputMode));
4460+
SLANG_RETURN_ON_FAIL(reporter.init(options.outputMode, options.expectedFailureList));
44614461

44624462
context.setTestReporter(&reporter);
44634463

‎tools/slang-test/test-context.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,12 @@ SlangResult TestContext::_createJSONRPCConnection(RefPtr<JSONRPCConnection>& out
186186
{
187187
CommandLine cmdLine;
188188
cmdLine.setExecutableLocation(ExecutableLocation(exeDirectoryPath, "test-server"));
189-
SLANG_RETURN_ON_FAIL(Process::create(cmdLine, Process::Flag::AttachDebugger, process));
189+
SLANG_RETURN_ON_FAIL(Process::create(cmdLine, Process::Flag::AttachDebugger | Process::Flag::DisableStdErrRedirection, process));
190190
}
191191

192192
Stream* writeStream = process->getStream(StdStreamType::In);
193193
RefPtr<BufferedReadStream> readStream(new BufferedReadStream(process->getStream(StdStreamType::Out)));
194+
RefPtr<BufferedReadStream> readErrStream(new BufferedReadStream(process->getStream(StdStreamType::ErrorOut)));
194195

195196
RefPtr<HTTPPacketConnection> connection = new HTTPPacketConnection(readStream, writeStream);
196197
RefPtr<JSONRPCConnection> rpcConnection = new JSONRPCConnection;

0 commit comments

Comments
 (0)