diff options
| author | Yi Zhang (CLR) <yzha@microsoft.com> | 2016-04-09 12:44:17 -0700 |
|---|---|---|
| committer | Yi Zhang (CLR) <yzha@microsoft.com> | 2016-04-09 12:44:17 -0700 |
| commit | c835bdc46cd2c39ae0666af56b4191b4090610b7 (patch) | |
| tree | 3f64deeb1eee6746287c9280a82bb77a8748cfa3 /tests | |
| parent | 32b2d2c0a5900ff85b941b29a08b05ff08d7f44b (diff) | |
| parent | 6f3ed699dd21347a953dff5d2607cc620258f141 (diff) | |
| download | coreclr-c835bdc46cd2c39ae0666af56b4191b4090610b7.tar.gz coreclr-c835bdc46cd2c39ae0666af56b4191b4090610b7.tar.bz2 coreclr-c835bdc46cd2c39ae0666af56b4191b4090610b7.zip | |
Merge pull request #4249 from yizhang82/lptstr_fix
Fix LPTSTRTest failure - it has a incorrect constant probably due to bad merge. Fix #4197
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/issues.targets | 6 | ||||
| -rwxr-xr-x | tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp | 4 | ||||
| -rw-r--r-- | tests/testsFailingOutsideWindows.txt | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/tests/issues.targets b/tests/issues.targets index 6c37a60d16..331e721ef7 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -310,12 +310,6 @@ <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_cs_il\_orelsin_cs_il.cmd" > <Issue>3216</Issue> </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\Interop\StringMarshalling\LPSTR\LPSTRTest\LPSTRTest.cmd" > - <Issue>3572</Issue> - </ExcludeList> - <ExcludeList Include="$(XunitTestBinBase)\Interop\StringMarshalling\LPTSTR\LPTSTRTest\LPTSTRTest.cmd" > - <Issue>3571</Issue> - </ExcludeList> <ExcludeList Include="$(XunitTestBinBase)\Interop\BestFitMapping\BestFitMapping\BestFitMapping.cmd" > <Issue>3571</Issue> </ExcludeList> diff --git a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp index 95f250be92..91b9b63d8e 100755 --- a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp +++ b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp @@ -11,7 +11,7 @@ const WCHAR* strReturn = W("a\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); const WCHAR* strErrReturn = W("Error"); -const WCHAR* strNative = W("Native\0String\0"); +const WCHAR* strNative = W(" Native\0String\0"); size_t lenstrNative = 7; //the len of strNative extern "C" LPWSTR ReturnString() @@ -152,4 +152,4 @@ extern "C" DLL_EXPORT BOOL __stdcall ReverseP_MarshalStrB_Out(Test_Del_MarshalSt return TRUE; -}
\ No newline at end of file +} diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index f7b8b91575..e93fc3a1c3 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -172,7 +172,6 @@ Interop/SimpleStruct/SimpleStruct/SimpleStruct.sh Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp/MarshalStructAsLayoutExp.sh Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq/MarshalStructAsLayoutSeq.sh Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest/MarshalArrayByValTest.sh -Interop/StringMarshalling/LPTSTR/LPTSTRTest/LPTSTRTest.sh GC/LargeMemory/Allocation/finalizertest/finalizertest.sh GC/LargeMemory/API/gc/reregisterforfinalize/reregisterforfinalize.sh GC/LargeMemory/API/gc/collect/collect.sh |