corefx-git: Update patch to use timeout(1)

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Mar 3 00:20:03 2016 +0100
Changeset:	4d1bf4b2706c81b7566f0716a111b25849dc76a6

Modified Files:
	corefx-git/distinfo
	corefx-git/patches/patch-run-test.sh
Removed Files:
	corefx-git/patches/patch-src_System.Diagnostics.TextWriterTraceListener_tests_System.Diagnostics.TextWriterTraceListener.Tests.csproj

Log Message:
corefx-git: Update patch to use timeout(1)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4d1bf4b2706c81b7566f0716a111b25849dc76a6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 corefx-git/distinfo                                         |  3 +--
 corefx-git/patches/patch-run-test.sh                        | 13 ++++++++-----
 ..._System.Diagnostics.TextWriterTraceListener.Tests.csproj | 13 -------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index 2b8f9d7..8f2f05f 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1,6 +1,5 @@
 $NetBSD$
-SHA1 (patch-run-test.sh) = 7d849403f8b4babf214ccf0b609712f770fa925c
-SHA1 (patch-src_System.Diagnostics.TextWriterTraceListener_tests_System.Diagnostics.TextWriterTraceListener.Tests.csproj) = 3444446dea13c4b3568a705150e204f6bf6142b1
+SHA1 (patch-run-test.sh) = a50960196fadc4e6d7b6c6f7bbf968b46ff284b4
 SHA1 (patch-src_System.IO.FileSystem.DriveInfo_tests_System.IO.FileSystem.DriveInfo.Tests.csproj) = 2566a3cb4e92de519569461cae2a2b9b6b6554da
 SHA1 (patch-src_System.Net.Http_tests_FunctionalTests_System.Net.Http.Functional.Tests.csproj) = b49b15fc11b7c5373d237ebea524dbeab77ac653
 SHA1 (patch-src_System.Net.NameResolution_tests_FunctionalTests_System.Net.NameResolution.Functional.Tests.csproj) = 20073552527d651b49ca54f12f38ee1d8e34e518
diff --git a/corefx-git/patches/patch-run-test.sh b/corefx-git/patches/patch-run-test.sh
index a8965d0..96a1caf 100644
--- a/corefx-git/patches/patch-run-test.sh
+++ b/corefx-git/patches/patch-run-test.sh
@@ -1,13 +1,16 @@
 $NetBSD$
 
---- run-test.sh.orig	2016-02-28 15:39:48.000000000 +0000
+--- run-test.sh.orig	2016-03-02 23:13:05.000000000 +0000
 +++ run-test.sh
-@@ -184,7 +184,7 @@ runtest()
+@@ -184,9 +184,9 @@ runtest()
  
    echo
    echo "Running tests in $dirName"
--  echo "./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing -notrait category=OuterLoop -notrait category=$xunitOSCategory" -notrait Benchmark=true
-+  echo "timeout 15m ./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing -notrait category=OuterLoop -notrait category=$xunitOSCategory" -notrait Benchmark=true
+-  echo "./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing $OuterLoop -notrait category=$xunitOSCategory" -notrait Benchmark=true
++  echo "timeout -s SIGKILL 15m ./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing $OuterLoop -notrait category=$xunitOSCategory" -notrait Benchmark=true
    echo
-   ./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing -notrait category=OuterLoop -notrait category=$xunitOSCategory -notrait Benchmark=true
+-  ./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing $OuterLoop -notrait category=$xunitOSCategory -notrait Benchmark=true
++  timeout -s SIGKILL 15m ./corerun xunit.console.netcore.exe $testDllName -xml testResults.xml -notrait category=failing $OuterLoop -notrait category=$xunitOSCategory -notrait Benchmark=true
    exitCode=$?
+ 
+   if [ $exitCode -ne 0 ]
diff --git a/corefx-git/patches/patch-src_System.Diagnostics.TextWriterTraceListener_tests_System.Diagnostics.TextWriterTraceListener.Tests.csproj b/corefx-git/patches/patch-src_System.Diagnostics.TextWriterTraceListener_tests_System.Diagnostics.TextWriterTraceListener.Tests.csproj
deleted file mode 100644
index 1547760..0000000
--- a/corefx-git/patches/patch-src_System.Diagnostics.TextWriterTraceListener_tests_System.Diagnostics.TextWriterTraceListener.Tests.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj.orig	2016-02-25 00:30:19.000000000 +0000
-+++ src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
-@@ -8,7 +8,7 @@
-     <RootNamespace>System.Diagnostics.TextWriterTraceListener.Tests</RootNamespace>
-     <AssemblyName>System.Diagnostics.TextWriterTraceListener.Tests</AssemblyName>
-     <ProjectGuid>{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}</ProjectGuid>
--    <UnsupportedPlatforms>Linux</UnsupportedPlatforms> <!-- TODO #6240: Tests failing with FileNotFoundExceptions -->
-+    <UnsupportedPlatforms>Linux;NetBSD</UnsupportedPlatforms> <!-- TODO #6240: Tests failing with FileNotFoundExceptions -->
-   </PropertyGroup>
-   <!-- Default configurations to help VS understand the configurations -->
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">