[ClangCL] Fix warning for rest part except clang. (#5705)
1. add noexcept for methods with __declspec(nothrow) 2. add override for override methods. 3. add const when cast const ptr for a const argument. 4. change 0 to 0u for immediate to avoid signed unsigned mismatch.
This commit is contained in:
Родитель
dd8a287bec
Коммит
039094228e
|
@ -44,6 +44,8 @@ struct ProcessInfo {
|
||||||
#error "ProcessInfo is not defined for this platform!"
|
#error "ProcessInfo is not defined for this platform!"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
enum : ProcessId { InvalidPid = 0 };
|
||||||
|
|
||||||
/// The process identifier.
|
/// The process identifier.
|
||||||
ProcessId Pid;
|
ProcessId Pid;
|
||||||
|
|
||||||
|
|
|
@ -2128,7 +2128,9 @@ void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int
|
||||||
for (y = 0; y < h; ++y)
|
for (y = 0; y < h; ++y)
|
||||||
{
|
{
|
||||||
tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
|
tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
|
||||||
tdefl_compress_buffer(pComp, (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH);
|
tdefl_compress_buffer(
|
||||||
|
pComp, (const mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl,
|
||||||
|
bpl, TDEFL_NO_FLUSH);
|
||||||
}
|
}
|
||||||
if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
|
if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
|
||||||
{
|
{
|
||||||
|
|
|
@ -194,7 +194,7 @@ public:
|
||||||
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
|
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
|
||||||
DXC_MICROCOM_TM_CTOR(DxilShaderReflection)
|
DXC_MICROCOM_TM_CTOR(DxilShaderReflection)
|
||||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
|
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
|
||||||
void **ppvObject) override {
|
void **ppvObject) noexcept override {
|
||||||
HRESULT hr = E_NOINTERFACE;
|
HRESULT hr = E_NOINTERFACE;
|
||||||
|
|
||||||
// There is non-standard handling of QueryInterface:
|
// There is non-standard handling of QueryInterface:
|
||||||
|
@ -221,49 +221,50 @@ public:
|
||||||
const DxilPartHeader *pRDATPart);
|
const DxilPartHeader *pRDATPart);
|
||||||
|
|
||||||
// ID3D12ShaderReflection
|
// ID3D12ShaderReflection
|
||||||
STDMETHODIMP GetDesc(D3D12_SHADER_DESC *pDesc) override;
|
STDMETHODIMP GetDesc(D3D12_SHADER_DESC *pDesc) noexcept override;
|
||||||
|
|
||||||
STDMETHODIMP_(ID3D12ShaderReflectionConstantBuffer *)
|
STDMETHODIMP_(ID3D12ShaderReflectionConstantBuffer *)
|
||||||
GetConstantBufferByIndex(UINT Index) override;
|
GetConstantBufferByIndex(UINT Index) noexcept override;
|
||||||
STDMETHODIMP_(ID3D12ShaderReflectionConstantBuffer *)
|
STDMETHODIMP_(ID3D12ShaderReflectionConstantBuffer *)
|
||||||
GetConstantBufferByName(LPCSTR Name) override;
|
GetConstantBufferByName(LPCSTR Name) noexcept override;
|
||||||
|
|
||||||
STDMETHODIMP
|
STDMETHODIMP
|
||||||
GetResourceBindingDesc(UINT ResourceIndex,
|
GetResourceBindingDesc(UINT ResourceIndex,
|
||||||
D3D12_SHADER_INPUT_BIND_DESC *pDesc) override;
|
D3D12_SHADER_INPUT_BIND_DESC *pDesc) noexcept override;
|
||||||
|
|
||||||
STDMETHODIMP
|
STDMETHODIMP GetInputParameterDesc(
|
||||||
GetInputParameterDesc(UINT ParameterIndex,
|
UINT ParameterIndex,
|
||||||
D3D12_SIGNATURE_PARAMETER_DESC *pDesc) override;
|
D3D12_SIGNATURE_PARAMETER_DESC *pDesc) noexcept override;
|
||||||
STDMETHODIMP
|
STDMETHODIMP GetOutputParameterDesc(
|
||||||
GetOutputParameterDesc(UINT ParameterIndex,
|
UINT ParameterIndex,
|
||||||
D3D12_SIGNATURE_PARAMETER_DESC *pDesc) override;
|
D3D12_SIGNATURE_PARAMETER_DESC *pDesc) noexcept override;
|
||||||
STDMETHODIMP
|
STDMETHODIMP GetPatchConstantParameterDesc(
|
||||||
GetPatchConstantParameterDesc(UINT ParameterIndex,
|
UINT ParameterIndex,
|
||||||
D3D12_SIGNATURE_PARAMETER_DESC *pDesc) override;
|
D3D12_SIGNATURE_PARAMETER_DESC *pDesc) noexcept override;
|
||||||
|
|
||||||
STDMETHODIMP_(ID3D12ShaderReflectionVariable *)
|
STDMETHODIMP_(ID3D12ShaderReflectionVariable *)
|
||||||
GetVariableByName(LPCSTR Name) override;
|
GetVariableByName(LPCSTR Name) noexcept override;
|
||||||
|
|
||||||
|
STDMETHODIMP GetResourceBindingDescByName(
|
||||||
|
LPCSTR Name, D3D12_SHADER_INPUT_BIND_DESC *pDesc) noexcept override;
|
||||||
|
|
||||||
|
STDMETHODIMP_(UINT) GetMovInstructionCount(THIS) noexcept override;
|
||||||
|
STDMETHODIMP_(UINT) GetMovcInstructionCount(THIS) noexcept override;
|
||||||
|
STDMETHODIMP_(UINT) GetConversionInstructionCount(THIS) noexcept override;
|
||||||
|
STDMETHODIMP_(UINT) GetBitwiseInstructionCount(THIS) noexcept override;
|
||||||
|
|
||||||
|
STDMETHODIMP_(D3D_PRIMITIVE) GetGSInputPrimitive(THIS) noexcept override;
|
||||||
|
STDMETHODIMP_(BOOL) IsSampleFrequencyShader(THIS) noexcept override;
|
||||||
|
|
||||||
|
STDMETHODIMP_(UINT) GetNumInterfaceSlots(THIS) noexcept override;
|
||||||
STDMETHODIMP
|
STDMETHODIMP
|
||||||
GetResourceBindingDescByName(LPCSTR Name,
|
GetMinFeatureLevel(D3D_FEATURE_LEVEL *pLevel) noexcept override;
|
||||||
D3D12_SHADER_INPUT_BIND_DESC *pDesc) override;
|
|
||||||
|
|
||||||
STDMETHODIMP_(UINT) GetMovInstructionCount() override;
|
|
||||||
STDMETHODIMP_(UINT) GetMovcInstructionCount() override;
|
|
||||||
STDMETHODIMP_(UINT) GetConversionInstructionCount() override;
|
|
||||||
STDMETHODIMP_(UINT) GetBitwiseInstructionCount() override;
|
|
||||||
|
|
||||||
STDMETHODIMP_(D3D_PRIMITIVE) GetGSInputPrimitive() override;
|
|
||||||
STDMETHODIMP_(BOOL) IsSampleFrequencyShader() override;
|
|
||||||
|
|
||||||
STDMETHODIMP_(UINT) GetNumInterfaceSlots() override;
|
|
||||||
STDMETHODIMP GetMinFeatureLevel(enum D3D_FEATURE_LEVEL *pLevel) override;
|
|
||||||
|
|
||||||
STDMETHODIMP_(UINT)
|
STDMETHODIMP_(UINT)
|
||||||
GetThreadGroupSize(UINT *pSizeX, UINT *pSizeY, UINT *pSizeZ) override;
|
GetThreadGroupSize(UINT *pSizeX, UINT *pSizeY,
|
||||||
|
UINT *pSizeZ) noexcept override;
|
||||||
|
|
||||||
STDMETHODIMP_(UINT64) GetRequiresFlags() override;
|
STDMETHODIMP_(UINT64) GetRequiresFlags(THIS) noexcept override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class CFunctionReflection;
|
class CFunctionReflection;
|
||||||
|
@ -287,7 +288,7 @@ public:
|
||||||
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
|
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
|
||||||
DXC_MICROCOM_TM_CTOR(DxilLibraryReflection)
|
DXC_MICROCOM_TM_CTOR(DxilLibraryReflection)
|
||||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
|
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
|
||||||
void **ppvObject) override {
|
void **ppvObject) noexcept override {
|
||||||
return DoBasicQueryInterface<ID3D12LibraryReflection>(this, iid, ppvObject);
|
return DoBasicQueryInterface<ID3D12LibraryReflection>(this, iid, ppvObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2316,7 +2317,8 @@ HRESULT DxilShaderReflection::Load(const DxilProgramHeader *pProgramHeader,
|
||||||
CATCH_CPP_RETURN_HRESULT();
|
CATCH_CPP_RETURN_HRESULT();
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DxilShaderReflection::GetDesc(D3D12_SHADER_DESC *pDesc) {
|
HRESULT
|
||||||
|
DxilShaderReflection::GetDesc(D3D12_SHADER_DESC *pDesc) noexcept {
|
||||||
if (nullptr == pDesc)
|
if (nullptr == pDesc)
|
||||||
return E_POINTER;
|
return E_POINTER;
|
||||||
memcpy(pDesc, &m_Desc, sizeof(D3D12_SHADER_DESC));
|
memcpy(pDesc, &m_Desc, sizeof(D3D12_SHADER_DESC));
|
||||||
|
@ -2536,7 +2538,7 @@ void DxilShaderReflection::InitDesc() {
|
||||||
}
|
}
|
||||||
|
|
||||||
ID3D12ShaderReflectionConstantBuffer *
|
ID3D12ShaderReflectionConstantBuffer *
|
||||||
DxilShaderReflection::GetConstantBufferByIndex(UINT Index) {
|
DxilShaderReflection::GetConstantBufferByIndex(UINT Index) noexcept {
|
||||||
return DxilModuleReflection::_GetConstantBufferByIndex(Index);
|
return DxilModuleReflection::_GetConstantBufferByIndex(Index);
|
||||||
}
|
}
|
||||||
ID3D12ShaderReflectionConstantBuffer *
|
ID3D12ShaderReflectionConstantBuffer *
|
||||||
|
@ -2548,7 +2550,7 @@ DxilModuleReflection::_GetConstantBufferByIndex(UINT Index) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ID3D12ShaderReflectionConstantBuffer *
|
ID3D12ShaderReflectionConstantBuffer *
|
||||||
DxilShaderReflection::GetConstantBufferByName(LPCSTR Name) {
|
DxilShaderReflection::GetConstantBufferByName(LPCSTR Name) noexcept {
|
||||||
return DxilModuleReflection::_GetConstantBufferByName(Name);
|
return DxilModuleReflection::_GetConstantBufferByName(Name);
|
||||||
}
|
}
|
||||||
ID3D12ShaderReflectionConstantBuffer *
|
ID3D12ShaderReflectionConstantBuffer *
|
||||||
|
@ -2575,7 +2577,7 @@ DxilModuleReflection::_GetConstantBufferByName(LPCSTR Name) {
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DxilShaderReflection::GetResourceBindingDesc(
|
HRESULT DxilShaderReflection::GetResourceBindingDesc(
|
||||||
UINT ResourceIndex, D3D12_SHADER_INPUT_BIND_DESC *pDesc) {
|
UINT ResourceIndex, D3D12_SHADER_INPUT_BIND_DESC *pDesc) noexcept {
|
||||||
return DxilModuleReflection::_GetResourceBindingDesc(ResourceIndex, pDesc,
|
return DxilModuleReflection::_GetResourceBindingDesc(ResourceIndex, pDesc,
|
||||||
m_PublicAPI);
|
m_PublicAPI);
|
||||||
}
|
}
|
||||||
|
@ -2593,7 +2595,7 @@ HRESULT DxilModuleReflection::_GetResourceBindingDesc(
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DxilShaderReflection::GetInputParameterDesc(
|
HRESULT DxilShaderReflection::GetInputParameterDesc(
|
||||||
UINT ParameterIndex, D3D12_SIGNATURE_PARAMETER_DESC *pDesc) {
|
UINT ParameterIndex, D3D12_SIGNATURE_PARAMETER_DESC *pDesc) noexcept {
|
||||||
IFRBOOL(pDesc != nullptr, E_INVALIDARG);
|
IFRBOOL(pDesc != nullptr, E_INVALIDARG);
|
||||||
IFRBOOL(ParameterIndex < m_InputSignature.size(), E_INVALIDARG);
|
IFRBOOL(ParameterIndex < m_InputSignature.size(), E_INVALIDARG);
|
||||||
if (m_PublicAPI != PublicAPI::D3D11_43)
|
if (m_PublicAPI != PublicAPI::D3D11_43)
|
||||||
|
@ -2608,7 +2610,7 @@ HRESULT DxilShaderReflection::GetInputParameterDesc(
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DxilShaderReflection::GetOutputParameterDesc(
|
HRESULT DxilShaderReflection::GetOutputParameterDesc(
|
||||||
UINT ParameterIndex, D3D12_SIGNATURE_PARAMETER_DESC *pDesc) {
|
UINT ParameterIndex, D3D12_SIGNATURE_PARAMETER_DESC *pDesc) noexcept {
|
||||||
IFRBOOL(pDesc != nullptr, E_INVALIDARG);
|
IFRBOOL(pDesc != nullptr, E_INVALIDARG);
|
||||||
IFRBOOL(ParameterIndex < m_OutputSignature.size(), E_INVALIDARG);
|
IFRBOOL(ParameterIndex < m_OutputSignature.size(), E_INVALIDARG);
|
||||||
if (m_PublicAPI != PublicAPI::D3D11_43)
|
if (m_PublicAPI != PublicAPI::D3D11_43)
|
||||||
|
@ -2622,8 +2624,9 @@ HRESULT DxilShaderReflection::GetOutputParameterDesc(
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DxilShaderReflection::GetPatchConstantParameterDesc(
|
HRESULT
|
||||||
UINT ParameterIndex, D3D12_SIGNATURE_PARAMETER_DESC *pDesc) {
|
DxilShaderReflection::GetPatchConstantParameterDesc(
|
||||||
|
UINT ParameterIndex, D3D12_SIGNATURE_PARAMETER_DESC *pDesc) noexcept {
|
||||||
IFRBOOL(pDesc != nullptr, E_INVALIDARG);
|
IFRBOOL(pDesc != nullptr, E_INVALIDARG);
|
||||||
IFRBOOL(ParameterIndex < m_PatchConstantSignature.size(), E_INVALIDARG);
|
IFRBOOL(ParameterIndex < m_PatchConstantSignature.size(), E_INVALIDARG);
|
||||||
if (m_PublicAPI != PublicAPI::D3D11_43)
|
if (m_PublicAPI != PublicAPI::D3D11_43)
|
||||||
|
@ -2638,7 +2641,7 @@ HRESULT DxilShaderReflection::GetPatchConstantParameterDesc(
|
||||||
}
|
}
|
||||||
|
|
||||||
ID3D12ShaderReflectionVariable *
|
ID3D12ShaderReflectionVariable *
|
||||||
DxilShaderReflection::GetVariableByName(LPCSTR Name) {
|
DxilShaderReflection::GetVariableByName(LPCSTR Name) noexcept {
|
||||||
return DxilModuleReflection::_GetVariableByName(Name);
|
return DxilModuleReflection::_GetVariableByName(Name);
|
||||||
}
|
}
|
||||||
ID3D12ShaderReflectionVariable *
|
ID3D12ShaderReflectionVariable *
|
||||||
|
@ -2657,7 +2660,7 @@ DxilModuleReflection::_GetVariableByName(LPCSTR Name) {
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT DxilShaderReflection::GetResourceBindingDescByName(
|
HRESULT DxilShaderReflection::GetResourceBindingDescByName(
|
||||||
LPCSTR Name, D3D12_SHADER_INPUT_BIND_DESC *pDesc) {
|
LPCSTR Name, D3D12_SHADER_INPUT_BIND_DESC *pDesc) noexcept {
|
||||||
return DxilModuleReflection::_GetResourceBindingDescByName(Name, pDesc,
|
return DxilModuleReflection::_GetResourceBindingDescByName(Name, pDesc,
|
||||||
m_PublicAPI);
|
m_PublicAPI);
|
||||||
}
|
}
|
||||||
|
@ -2679,32 +2682,34 @@ HRESULT DxilModuleReflection::_GetResourceBindingDescByName(
|
||||||
return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
|
return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT DxilShaderReflection::GetMovInstructionCount() { return 0; }
|
UINT DxilShaderReflection::GetMovInstructionCount() noexcept { return 0; }
|
||||||
UINT DxilShaderReflection::GetMovcInstructionCount() { return 0; }
|
UINT DxilShaderReflection::GetMovcInstructionCount() noexcept { return 0; }
|
||||||
UINT DxilShaderReflection::GetConversionInstructionCount() { return 0; }
|
UINT DxilShaderReflection::GetConversionInstructionCount() noexcept {
|
||||||
UINT DxilShaderReflection::GetBitwiseInstructionCount() { return 0; }
|
return 0;
|
||||||
|
}
|
||||||
|
UINT DxilShaderReflection::GetBitwiseInstructionCount() noexcept { return 0; }
|
||||||
|
|
||||||
D3D_PRIMITIVE DxilShaderReflection::GetGSInputPrimitive() {
|
D3D_PRIMITIVE DxilShaderReflection::GetGSInputPrimitive() noexcept {
|
||||||
if (!m_pDxilModule->GetShaderModel()->IsGS())
|
if (!m_pDxilModule->GetShaderModel()->IsGS())
|
||||||
return D3D_PRIMITIVE::D3D10_PRIMITIVE_UNDEFINED;
|
return D3D_PRIMITIVE::D3D10_PRIMITIVE_UNDEFINED;
|
||||||
return (D3D_PRIMITIVE)m_pDxilModule->GetInputPrimitive();
|
return (D3D_PRIMITIVE)m_pDxilModule->GetInputPrimitive();
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL DxilShaderReflection::IsSampleFrequencyShader() {
|
BOOL DxilShaderReflection::IsSampleFrequencyShader() noexcept {
|
||||||
// TODO: determine correct value
|
// TODO: determine correct value
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT DxilShaderReflection::GetNumInterfaceSlots() { return 0; }
|
UINT DxilShaderReflection::GetNumInterfaceSlots() noexcept { return 0; }
|
||||||
|
|
||||||
HRESULT
|
HRESULT
|
||||||
DxilShaderReflection::GetMinFeatureLevel(enum D3D_FEATURE_LEVEL *pLevel) {
|
DxilShaderReflection::GetMinFeatureLevel(D3D_FEATURE_LEVEL *pLevel) noexcept {
|
||||||
IFR(AssignToOut(D3D_FEATURE_LEVEL_12_0, pLevel));
|
IFR(AssignToOut(D3D_FEATURE_LEVEL_12_0, pLevel));
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT DxilShaderReflection::GetThreadGroupSize(UINT *pSizeX, UINT *pSizeY,
|
UINT DxilShaderReflection::GetThreadGroupSize(UINT *pSizeX, UINT *pSizeY,
|
||||||
UINT *pSizeZ) {
|
UINT *pSizeZ) noexcept {
|
||||||
if (!m_pDxilModule->GetShaderModel()->IsCS() &&
|
if (!m_pDxilModule->GetShaderModel()->IsCS() &&
|
||||||
!m_pDxilModule->GetShaderModel()->IsMS() &&
|
!m_pDxilModule->GetShaderModel()->IsMS() &&
|
||||||
!m_pDxilModule->GetShaderModel()->IsAS()) {
|
!m_pDxilModule->GetShaderModel()->IsAS()) {
|
||||||
|
@ -2722,7 +2727,7 @@ UINT DxilShaderReflection::GetThreadGroupSize(UINT *pSizeX, UINT *pSizeY,
|
||||||
return x * y * z;
|
return x * y * z;
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT64 DxilShaderReflection::GetRequiresFlags() {
|
UINT64 DxilShaderReflection::GetRequiresFlags() noexcept {
|
||||||
UINT64 result = m_pDxilModule->m_ShaderFlags.GetFeatureInfo();
|
UINT64 result = m_pDxilModule->m_ShaderFlags.GetFeatureInfo();
|
||||||
// FeatureInfo flags are identical, with the exception of a collision between:
|
// FeatureInfo flags are identical, with the exception of a collision between:
|
||||||
// SHADER_FEATURE_COMPUTE_SHADERS_PLUS_RAW_AND_STRUCTURED_BUFFERS_VIA_SHADER_4_X
|
// SHADER_FEATURE_COMPUTE_SHADERS_PLUS_RAW_AND_STRUCTURED_BUFFERS_VIA_SHADER_4_X
|
||||||
|
|
|
@ -188,7 +188,7 @@ TEST(ProgramTest, TestExecuteNoWait) {
|
||||||
ProcessInfo PI1 = ExecuteNoWait(Executable, argv, &envp[0], nullptr, 0,
|
ProcessInfo PI1 = ExecuteNoWait(Executable, argv, &envp[0], nullptr, 0,
|
||||||
&Error, &ExecutionFailed);
|
&Error, &ExecutionFailed);
|
||||||
ASSERT_FALSE(ExecutionFailed) << Error;
|
ASSERT_FALSE(ExecutionFailed) << Error;
|
||||||
ASSERT_NE(PI1.Pid, 0) << "Invalid process id";
|
ASSERT_NE(PI1.Pid, ProcessInfo::InvalidPid) << "Invalid process id";
|
||||||
|
|
||||||
unsigned LoopCount = 0;
|
unsigned LoopCount = 0;
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ TEST(ProgramTest, TestExecuteNoWait) {
|
||||||
ProcessInfo PI2 = ExecuteNoWait(Executable, argv, &envp[0], nullptr, 0,
|
ProcessInfo PI2 = ExecuteNoWait(Executable, argv, &envp[0], nullptr, 0,
|
||||||
&Error, &ExecutionFailed);
|
&Error, &ExecutionFailed);
|
||||||
ASSERT_FALSE(ExecutionFailed) << Error;
|
ASSERT_FALSE(ExecutionFailed) << Error;
|
||||||
ASSERT_NE(PI2.Pid, 0) << "Invalid process id";
|
ASSERT_NE(PI2.Pid, ProcessInfo::InvalidPid) << "Invalid process id";
|
||||||
|
|
||||||
// Test that Wait() with SecondsToWait=0 performs a non-blocking wait. In this
|
// Test that Wait() with SecondsToWait=0 performs a non-blocking wait. In this
|
||||||
// cse, LoopCount should be greater than 1 (more than one increment occurs).
|
// cse, LoopCount should be greater than 1 (more than one increment occurs).
|
||||||
|
@ -272,7 +272,7 @@ TEST(ProgramTest, TestExecuteNegative) {
|
||||||
bool ExecutionFailed;
|
bool ExecutionFailed;
|
||||||
ProcessInfo PI = ExecuteNoWait(Executable, argv, nullptr, nullptr, 0,
|
ProcessInfo PI = ExecuteNoWait(Executable, argv, nullptr, nullptr, 0,
|
||||||
&Error, &ExecutionFailed);
|
&Error, &ExecutionFailed);
|
||||||
ASSERT_EQ(PI.Pid, 0)
|
ASSERT_EQ(PI.Pid, ProcessInfo::InvalidPid)
|
||||||
<< "On error ExecuteNoWait should return an invalid ProcessInfo";
|
<< "On error ExecuteNoWait should return an invalid ProcessInfo";
|
||||||
ASSERT_TRUE(ExecutionFailed);
|
ASSERT_TRUE(ExecutionFailed);
|
||||||
ASSERT_FALSE(Error.empty());
|
ASSERT_FALSE(Error.empty());
|
||||||
|
|
Загрузка…
Ссылка в новой задаче