Author: rolf
Date: 2008-02-12 10:24:27 -0500 (Tue, 12 Feb 2008)
New Revision: 95516
Added:
trunk/mono-basic/vbnc/rt/source/rt9.sln
trunk/mono-basic/vbnc/rt/source/rt9.vbproj
Modified:
trunk/mono-basic/vbnc/rt/source/AssemblyInfo.vb
trunk/mono-basic/vbnc/rt/source/ExternalProcessExecutor.vb
trunk/mono-basic/vbnc/rt/source/ExternalProcessVerification.vb
trunk/mono-basic/vbnc/rt/source/Test.vb
trunk/mono-basic/vbnc/rt/source/TestExecutor.vb
trunk/mono-basic/vbnc/rt/source/frmMain.Designer.vb
trunk/mono-basic/vbnc/rt/source/frmMain.vb
trunk/mono-basic/vbnc/rt/source/frmTestEditor.vb
Log:
Merge back from branch.
Modified: trunk/mono-basic/vbnc/rt/source/AssemblyInfo.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/AssemblyInfo.vb 2008-02-12 15:22:33 UTC
(rev 95515)
+++ trunk/mono-basic/vbnc/rt/source/AssemblyInfo.vb 2008-02-12 15:24:27 UTC
(rev 95516)
@@ -50,5 +50,5 @@
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("0.0.0.271")>
+<Assembly: AssemblyVersion("0.0.0.273")>
<Assembly: AssemblyFileVersion("0.0.0.1")>
Modified: trunk/mono-basic/vbnc/rt/source/ExternalProcessExecutor.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/ExternalProcessExecutor.vb 2008-02-12
15:22:33 UTC (rev 95515)
+++ trunk/mono-basic/vbnc/rt/source/ExternalProcessExecutor.vb 2008-02-12
15:24:27 UTC (rev 95516)
@@ -144,7 +144,7 @@
m_Executable = Environment.ExpandEnvironmentVariables(Executable)
m_ExpandedCmdLine = m_UnexpandedCmdLine
m_ExpandedCmdLine =
Environment.ExpandEnvironmentVariables(m_ExpandedCmdLine)
- m_TimeOut = TimeOut
+ m_TimeOut = TimeOut * 4
m_WorkingDirectory = WorkingDirectory
If IO.File.Exists(m_Executable) Then m_Version =
FileVersionInfo.GetVersionInfo(m_Executable)
End Sub
Modified: trunk/mono-basic/vbnc/rt/source/ExternalProcessVerification.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/ExternalProcessVerification.vb
2008-02-12 15:22:33 UTC (rev 95515)
+++ trunk/mono-basic/vbnc/rt/source/ExternalProcessVerification.vb
2008-02-12 15:24:27 UTC (rev 95516)
@@ -107,7 +107,7 @@
If m_Process.Executable.Contains("PEVerify") Then
Debug.WriteLine(MyBase.DescriptiveMessage)
If MyBase.DescriptiveMessage.ToLowerInvariant.Contains("warning")
Then
- Stop
+ 'Stop
End If
End If
Modified: trunk/mono-basic/vbnc/rt/source/Test.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/Test.vb 2008-02-12 15:22:33 UTC (rev
95515)
+++ trunk/mono-basic/vbnc/rt/source/Test.vb 2008-02-12 15:24:27 UTC (rev
95516)
@@ -679,7 +679,7 @@
Private ReadOnly Property GetACPath() As String
Get
If m_AC <> String.Empty Then Return m_AC
- Return IO.Path.GetFullPath("..\..\ac\bin\ac.exe".Replace("\",
IO.Path.DirectorySeparatorChar))
+ Return IO.Path.GetFullPath("..\..\..\ac\bin\ac.exe".Replace("\",
IO.Path.DirectorySeparatorChar))
End Get
End Property
@@ -742,8 +742,15 @@
m_Verifications(m_Verifications.Count - 1).Name = "Test
executable verification"
End If
- 'm_Verifications.Add(New XMLVerifier(Me))
- 'm_Verifications(m_Verifications.Count - 1).Name = "Xml
verification"
+ Dim peverify As String
+ peverify = Environment.ExpandEnvironmentVariables(PEVerifyPath)
+ If peverify <> String.Empty AndAlso IO.File.Exists(peverify) Then
+ Dim peV As New ExternalProcessVerification(Me, peverify,
"%OUTPUTASSEMBLY% /nologo /verbose")
+ peV.Name = "Type Safety and Security Verification"
+ peV.Process.DependentFiles.AddRange(m_References)
+ peV.Process.WorkingDirectory = IO.Path.Combine(BasePath,
"testoutput")
+ m_Verifications.Add(peV)
+ End If
Dim ac As String
ac = GetACPath
@@ -756,16 +763,6 @@
m_Verifications.Add(acV)
End If
- Dim peverify As String
- peverify = Environment.ExpandEnvironmentVariables(PEVerifyPath)
- If peverify <> String.Empty AndAlso IO.File.Exists(peverify) Then
- Dim peV As New ExternalProcessVerification(Me, peverify,
"%OUTPUTASSEMBLY% /nologo /verbose")
- peV.Name = "Type Safety and Security Verification"
- peV.Process.DependentFiles.AddRange(m_References)
- peV.Process.WorkingDirectory = IO.Path.Combine(BasePath,
"testoutput")
- m_Verifications.Add(peV)
- End If
-
If Me.m_Target = "exe" AndAlso m_DontExecute = False Then
Dim executor As String
executor = GetExecutor()
Modified: trunk/mono-basic/vbnc/rt/source/TestExecutor.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/TestExecutor.vb 2008-02-12 15:22:33 UTC
(rev 95515)
+++ trunk/mono-basic/vbnc/rt/source/TestExecutor.vb 2008-02-12 15:24:27 UTC
(rev 95516)
@@ -185,6 +185,12 @@
End If
End If
Next
+ Dim tp As Tests = TryCast(Tests, Tests)
+ If tp IsNot Nothing Then
+ For Each tl As TestList In tp.ContainedTests
+ RunAsync(tl, Priority)
+ Next
+ End If
End SyncLock
StartThread()
End Sub
Modified: trunk/mono-basic/vbnc/rt/source/frmMain.Designer.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/frmMain.Designer.vb 2008-02-12 15:22:33 UTC
(rev 95515)
+++ trunk/mono-basic/vbnc/rt/source/frmMain.Designer.vb 2008-02-12 15:24:27 UTC
(rev 95516)
@@ -70,6 +70,7 @@
Me.CreateNewTestToolStripMenuItem = New
System.Windows.Forms.ToolStripMenuItem
Me.CreateNewTestCopyingThisTestToolStripMenuItem = New
System.Windows.Forms.ToolStripMenuItem
Me.CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem = New
System.Windows.Forms.ToolStripMenuItem
+ Me.MakeErrorTestToolStripMenuItem = New
System.Windows.Forms.ToolStripMenuItem
Me.cmdPause = New System.Windows.Forms.Button
Me.cmdRun = New System.Windows.Forms.Button
Me.cmdExit = New System.Windows.Forms.Button
@@ -139,7 +140,6 @@
Me.chkDontTestIfNothingHasChanged = New System.Windows.Forms.CheckBox
Me.cmdSelfTest = New System.Windows.Forms.Button
Me.worker = New System.ComponentModel.BackgroundWorker
- Me.MakeErrorTestToolStripMenuItem = New
System.Windows.Forms.ToolStripMenuItem
Me.mnuMain.SuspendLayout()
Me.cmnuTest.SuspendLayout()
Me.cmnuTree.SuspendLayout()
@@ -171,33 +171,33 @@
'mnuToolsChangeOutputToVerified
'
Me.mnuToolsChangeOutputToVerified.Name =
"mnuToolsChangeOutputToVerified"
- Me.mnuToolsChangeOutputToVerified.Size = New System.Drawing.Size(295,
22)
+ Me.mnuToolsChangeOutputToVerified.Size = New System.Drawing.Size(284,
22)
Me.mnuToolsChangeOutputToVerified.Text = "Change output xml files to
verified xml files."
'
'cmnuViewCode
'
Me.cmnuViewCode.Name = "cmnuViewCode"
- Me.cmnuViewCode.Size = New System.Drawing.Size(295, 22)
+ Me.cmnuViewCode.Size = New System.Drawing.Size(284, 22)
Me.cmnuViewCode.Text = "View code"
'
'mnuToolsRefresh
'
Me.mnuToolsRefresh.Name = "mnuToolsRefresh"
Me.mnuToolsRefresh.ShortcutKeys = System.Windows.Forms.Keys.F5
- Me.mnuToolsRefresh.Size = New System.Drawing.Size(295, 22)
+ Me.mnuToolsRefresh.Size = New System.Drawing.Size(284, 22)
Me.mnuToolsRefresh.Text = "&Refresh"
'
'NewTestToolStripMenuItem
'
Me.NewTestToolStripMenuItem.Name = "NewTestToolStripMenuItem"
Me.NewTestToolStripMenuItem.ShortcutKeys =
CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N),
System.Windows.Forms.Keys)
- Me.NewTestToolStripMenuItem.Size = New System.Drawing.Size(295, 22)
+ Me.NewTestToolStripMenuItem.Size = New System.Drawing.Size(284, 22)
Me.NewTestToolStripMenuItem.Text = "New test"
'
'ViewQueuedTestsToolStripMenuItem
'
Me.ViewQueuedTestsToolStripMenuItem.Name =
"ViewQueuedTestsToolStripMenuItem"
- Me.ViewQueuedTestsToolStripMenuItem.Size = New
System.Drawing.Size(295, 22)
+ Me.ViewQueuedTestsToolStripMenuItem.Size = New
System.Drawing.Size(284, 22)
Me.ViewQueuedTestsToolStripMenuItem.Text = "View queued tests"
'
'lstImages
@@ -253,102 +253,108 @@
'
Me.cmnuTest.Items.AddRange(New System.Windows.Forms.ToolStripItem()
{Me.cmnuRunTest, Me.ToolStripSeparator1, Me.cmnuViewCodeAndDebugTest,
Me.cmnuViewCode2, Me.cmnuDebugTest, Me.EditThisTestToolStripMenuItem,
Me.ToolStripSeparator3, Me.cmnuOutputToVerified, Me.ReflectToolStripMenuItem,
Me.ToolStripSeparator2, Me.CreateNewTestToolStripMenuItem,
Me.CreateNewTestCopyingThisTestToolStripMenuItem,
Me.CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem,
Me.MakeErrorTestToolStripMenuItem})
Me.cmnuTest.Name = "cmnuTest"
- Me.cmnuTest.Size = New System.Drawing.Size(379, 286)
+ Me.cmnuTest.Size = New System.Drawing.Size(368, 264)
'
'cmnuRunTest
'
Me.cmnuRunTest.Name = "cmnuRunTest"
- Me.cmnuRunTest.Size = New System.Drawing.Size(378, 22)
+ Me.cmnuRunTest.Size = New System.Drawing.Size(367, 22)
Me.cmnuRunTest.Text = "Run this test"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(375, 6)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(364, 6)
'
'cmnuViewCodeAndDebugTest
'
Me.cmnuViewCodeAndDebugTest.Name = "cmnuViewCodeAndDebugTest"
- Me.cmnuViewCodeAndDebugTest.Size = New System.Drawing.Size(378, 22)
+ Me.cmnuViewCodeAndDebugTest.Size = New System.Drawing.Size(367, 22)
Me.cmnuViewCodeAndDebugTest.Text = "&View Code (external editor) and
Set this test to be debugged"
'
'cmnuViewCode2
'
Me.cmnuViewCode2.Name = "cmnuViewCode2"
- Me.cmnuViewCode2.Size = New System.Drawing.Size(378, 22)
+ Me.cmnuViewCode2.Size = New System.Drawing.Size(367, 22)
Me.cmnuViewCode2.Text = "View code (external editor)"
'
'cmnuDebugTest
'
Me.cmnuDebugTest.Name = "cmnuDebugTest"
- Me.cmnuDebugTest.Size = New System.Drawing.Size(378, 22)
+ Me.cmnuDebugTest.Size = New System.Drawing.Size(367, 22)
Me.cmnuDebugTest.Text = "&Set this test to be debugged"
'
'EditThisTestToolStripMenuItem
'
Me.EditThisTestToolStripMenuItem.Name = "EditThisTestToolStripMenuItem"
- Me.EditThisTestToolStripMenuItem.Size = New System.Drawing.Size(378,
22)
+ Me.EditThisTestToolStripMenuItem.Size = New System.Drawing.Size(367,
22)
Me.EditThisTestToolStripMenuItem.Text = "Edit this test (internal
editor)"
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(375, 6)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(364, 6)
'
'cmnuOutputToVerified
'
Me.cmnuOutputToVerified.Name = "cmnuOutputToVerified"
- Me.cmnuOutputToVerified.Size = New System.Drawing.Size(378, 22)
+ Me.cmnuOutputToVerified.Size = New System.Drawing.Size(367, 22)
Me.cmnuOutputToVerified.Text = "Change output files to verified files"
'
'ReflectToolStripMenuItem
'
Me.ReflectToolStripMenuItem.DropDownItems.AddRange(New
System.Windows.Forms.ToolStripItem() {Me.VBNCAssemblyToolStripMenuItem,
Me.VBCAssemblyToolStripMenuItem, Me.BothAssembliesToolStripMenuItem})
Me.ReflectToolStripMenuItem.Name = "ReflectToolStripMenuItem"
- Me.ReflectToolStripMenuItem.Size = New System.Drawing.Size(378, 22)
+ Me.ReflectToolStripMenuItem.Size = New System.Drawing.Size(367, 22)
Me.ReflectToolStripMenuItem.Text = "Reflect"
'
'VBNCAssemblyToolStripMenuItem
'
Me.VBNCAssemblyToolStripMenuItem.Name = "VBNCAssemblyToolStripMenuItem"
- Me.VBNCAssemblyToolStripMenuItem.Size = New System.Drawing.Size(161,
22)
+ Me.VBNCAssemblyToolStripMenuItem.Size = New System.Drawing.Size(150,
22)
Me.VBNCAssemblyToolStripMenuItem.Text = "VBNC assembly"
'
'VBCAssemblyToolStripMenuItem
'
Me.VBCAssemblyToolStripMenuItem.Name = "VBCAssemblyToolStripMenuItem"
- Me.VBCAssemblyToolStripMenuItem.Size = New System.Drawing.Size(161, 22)
+ Me.VBCAssemblyToolStripMenuItem.Size = New System.Drawing.Size(150, 22)
Me.VBCAssemblyToolStripMenuItem.Text = "VBC assembly"
'
'BothAssembliesToolStripMenuItem
'
Me.BothAssembliesToolStripMenuItem.Name =
"BothAssembliesToolStripMenuItem"
- Me.BothAssembliesToolStripMenuItem.Size = New System.Drawing.Size(161,
22)
+ Me.BothAssembliesToolStripMenuItem.Size = New System.Drawing.Size(150,
22)
Me.BothAssembliesToolStripMenuItem.Text = "Both assemblies"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New System.Drawing.Size(375, 6)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(364, 6)
'
'CreateNewTestToolStripMenuItem
'
Me.CreateNewTestToolStripMenuItem.Name =
"CreateNewTestToolStripMenuItem"
- Me.CreateNewTestToolStripMenuItem.Size = New System.Drawing.Size(378,
22)
+ Me.CreateNewTestToolStripMenuItem.Size = New System.Drawing.Size(367,
22)
Me.CreateNewTestToolStripMenuItem.Text = "Create new test"
'
'CreateNewTestCopyingThisTestToolStripMenuItem
'
Me.CreateNewTestCopyingThisTestToolStripMenuItem.Name =
"CreateNewTestCopyingThisTestToolStripMenuItem"
- Me.CreateNewTestCopyingThisTestToolStripMenuItem.Size = New
System.Drawing.Size(378, 22)
+ Me.CreateNewTestCopyingThisTestToolStripMenuItem.Size = New
System.Drawing.Size(367, 22)
Me.CreateNewTestCopyingThisTestToolStripMenuItem.Text = "Create new
test copying this test"
'
'CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem
'
Me.CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem.Name =
"CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem"
- Me.CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem.Size = New
System.Drawing.Size(378, 22)
+ Me.CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem.Size = New
System.Drawing.Size(367, 22)
Me.CreateNewTestUsingThisTestAsBaseNameToolStripMenuItem.Text =
"Create new test using this test as base name"
'
+ 'MakeErrorTestToolStripMenuItem
+ '
+ Me.MakeErrorTestToolStripMenuItem.Name =
"MakeErrorTestToolStripMenuItem"
+ Me.MakeErrorTestToolStripMenuItem.Size = New System.Drawing.Size(367,
22)
+ Me.MakeErrorTestToolStripMenuItem.Text = "Make error test"
+ '
'cmdPause
'
Me.cmdPause.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or
System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -458,55 +464,55 @@
'
Me.cmnuTree.Items.AddRange(New System.Windows.Forms.ToolStripItem()
{Me.RunTestsToolStripMenuItem, Me.CreateNewTestInThisFolderToolStripMenuItem,
Me.OnlyRefreshToolStripMenuItem})
Me.cmnuTree.Name = "cmnuTree"
- Me.cmnuTree.Size = New System.Drawing.Size(226, 70)
+ Me.cmnuTree.Size = New System.Drawing.Size(215, 70)
'
'RunTestsToolStripMenuItem
'
Me.RunTestsToolStripMenuItem.DropDownItems.AddRange(New
System.Windows.Forms.ToolStripItem() {Me.AllTestsToolStripMenuItem,
Me.FailedTestsToolStripMenuItem, Me.SucceededTestsToolStripMenuItem,
Me.NotRunTestsToolStripMenuItem, Me.RunTestsToolStripMenuItem1})
Me.RunTestsToolStripMenuItem.Name = "RunTestsToolStripMenuItem"
- Me.RunTestsToolStripMenuItem.Size = New System.Drawing.Size(225, 22)
+ Me.RunTestsToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.RunTestsToolStripMenuItem.Text = "&Run tests"
'
'AllTestsToolStripMenuItem
'
Me.AllTestsToolStripMenuItem.Name = "AllTestsToolStripMenuItem"
- Me.AllTestsToolStripMenuItem.Size = New System.Drawing.Size(164, 22)
+ Me.AllTestsToolStripMenuItem.Size = New System.Drawing.Size(153, 22)
Me.AllTestsToolStripMenuItem.Text = "&All tests"
'
'FailedTestsToolStripMenuItem
'
Me.FailedTestsToolStripMenuItem.Name = "FailedTestsToolStripMenuItem"
- Me.FailedTestsToolStripMenuItem.Size = New System.Drawing.Size(164, 22)
+ Me.FailedTestsToolStripMenuItem.Size = New System.Drawing.Size(153, 22)
Me.FailedTestsToolStripMenuItem.Text = "&Failed tests"
'
'SucceededTestsToolStripMenuItem
'
Me.SucceededTestsToolStripMenuItem.Name =
"SucceededTestsToolStripMenuItem"
- Me.SucceededTestsToolStripMenuItem.Size = New System.Drawing.Size(164,
22)
+ Me.SucceededTestsToolStripMenuItem.Size = New System.Drawing.Size(153,
22)
Me.SucceededTestsToolStripMenuItem.Text = "&Succeeded tests"
'
'NotRunTestsToolStripMenuItem
'
Me.NotRunTestsToolStripMenuItem.Name = "NotRunTestsToolStripMenuItem"
- Me.NotRunTestsToolStripMenuItem.Size = New System.Drawing.Size(164, 22)
+ Me.NotRunTestsToolStripMenuItem.Size = New System.Drawing.Size(153, 22)
Me.NotRunTestsToolStripMenuItem.Text = "&Not run tests"
'
'RunTestsToolStripMenuItem1
'
Me.RunTestsToolStripMenuItem1.Name = "RunTestsToolStripMenuItem1"
- Me.RunTestsToolStripMenuItem1.Size = New System.Drawing.Size(164, 22)
+ Me.RunTestsToolStripMenuItem1.Size = New System.Drawing.Size(153, 22)
Me.RunTestsToolStripMenuItem1.Text = "&Run tests"
'
'CreateNewTestInThisFolderToolStripMenuItem
'
Me.CreateNewTestInThisFolderToolStripMenuItem.Name =
"CreateNewTestInThisFolderToolStripMenuItem"
- Me.CreateNewTestInThisFolderToolStripMenuItem.Size = New
System.Drawing.Size(225, 22)
+ Me.CreateNewTestInThisFolderToolStripMenuItem.Size = New
System.Drawing.Size(214, 22)
Me.CreateNewTestInThisFolderToolStripMenuItem.Text = "Create new test
in this folder"
'
'OnlyRefreshToolStripMenuItem
'
Me.OnlyRefreshToolStripMenuItem.Name = "OnlyRefreshToolStripMenuItem"
- Me.OnlyRefreshToolStripMenuItem.Size = New System.Drawing.Size(225, 22)
+ Me.OnlyRefreshToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.OnlyRefreshToolStripMenuItem.Text = "Only refresh"
'
'tabMain
@@ -864,6 +870,7 @@
Me.txtMessage.Anchor =
CType(((System.Windows.Forms.AnchorStyles.Bottom Or
System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),
System.Windows.Forms.AnchorStyles)
Me.txtMessage.BackColor = System.Drawing.Color.White
+ Me.txtMessage.Font = New System.Drawing.Font("Courier New", 8.25!,
System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,
Byte))
Me.txtMessage.Location = New System.Drawing.Point(6, 173)
Me.txtMessage.Multiline = True
Me.txtMessage.Name = "txtMessage"
@@ -1008,12 +1015,6 @@
'worker
'
'
- 'MakeErrorTestToolStripMenuItem
- '
- Me.MakeErrorTestToolStripMenuItem.Name =
"MakeErrorTestToolStripMenuItem"
- Me.MakeErrorTestToolStripMenuItem.Size = New System.Drawing.Size(378,
22)
- Me.MakeErrorTestToolStripMenuItem.Text = "Make error test"
- '
'frmMain
'
Me.ClientSize = New System.Drawing.Size(940, 621)
Modified: trunk/mono-basic/vbnc/rt/source/frmMain.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/frmMain.vb 2008-02-12 15:22:33 UTC (rev
95515)
+++ trunk/mono-basic/vbnc/rt/source/frmMain.vb 2008-02-12 15:24:27 UTC (rev
95516)
@@ -1207,43 +1207,43 @@
End Sub
Private Sub LoadOldResults()
- Static thread As Threading.Thread
- Static sync As New Object
+ 'Static thread As Threading.Thread
+ 'Static sync As New Object
Return
- SyncLock sync
- If thread Is Nothing Then
- thread = New Threading.Thread(New
Threading.ThreadStart(AddressOf LoadOldResults))
- thread.Start()
- Exit Sub
- End If
- End SyncLock
+ 'SyncLock sync
+ ' If thread Is Nothing Then
+ ' thread = New Threading.Thread(New
Threading.ThreadStart(AddressOf LoadOldResults))
+ ' thread.Start()
+ ' Exit Sub
+ ' End If
+ 'End SyncLock
- Try
- Dim tests As Tests = m_Tests
- Dim stack As New Generic.Queue(Of Tests)
+ 'Try
+ ' Dim tests As Tests = m_Tests
+ ' Dim stack As New Generic.Queue(Of Tests)
- stack.Enqueue(tests)
- Do Until stack.Count = 0
- tests = stack.Dequeue
- For Each subtests As Tests In tests.ContainedTests
- stack.Enqueue(subtests)
- Next
- For Each test As Test In tests
- If Me.IsDisposed Then Exit Do
- Try
- Me.Invoke(New CrossAppDomainDelegate(AddressOf
test.LoadOldResults))
- Catch ex As Exception
- Continue For
- End Try
- Threading.Thread.Sleep(0)
- Next
- Loop
- thread = Nothing
- Catch ex As Exception
- MsgBox(ex.Message & vbNewLine & ex.StackTrace,
MsgBoxStyle.Exclamation)
- End Try
+ ' stack.Enqueue(tests)
+ ' Do Until stack.Count = 0
+ ' tests = stack.Dequeue
+ ' For Each subtests As Tests In tests.ContainedTests
+ ' stack.Enqueue(subtests)
+ ' Next
+ ' For Each test As Test In tests
+ ' If Me.IsDisposed Then Exit Do
+ ' Try
+ ' Me.Invoke(New CrossAppDomainDelegate(AddressOf
test.LoadOldResults))
+ ' Catch ex As Exception
+ ' Continue For
+ ' End Try
+ ' Threading.Thread.Sleep(0)
+ ' Next
+ ' Loop
+ ' thread = Nothing
+ 'Catch ex As Exception
+ ' MsgBox(ex.Message & vbNewLine & ex.StackTrace,
MsgBoxStyle.Exclamation)
+ 'End Try
End Sub
Private Sub cmdSelfTest_Click(ByVal sender As System.Object, ByVal e As
System.EventArgs) Handles cmdSelfTest.Click
Modified: trunk/mono-basic/vbnc/rt/source/frmTestEditor.vb
===================================================================
--- trunk/mono-basic/vbnc/rt/source/frmTestEditor.vb 2008-02-12 15:22:33 UTC
(rev 95515)
+++ trunk/mono-basic/vbnc/rt/source/frmTestEditor.vb 2008-02-12 15:24:27 UTC
(rev 95516)
@@ -34,7 +34,7 @@
End If
End If
- IO.File.WriteAllText(IO.Path.Combine(txtFolder.Text,
txtFile.Text), txtCode.Text, System.Text.UnicodeEncoding.Unicode)
+ IO.File.WriteAllText(IO.Path.Combine(txtFolder.Text,
txtFile.Text), txtCode.Text, System.Text.Encoding.GetEncoding(65001))
Catch ex As Exception
MsgBox(ex.Message & vbNewLine & ex.StackTrace)
Copied: trunk/mono-basic/vbnc/rt/source/rt9.sln (from rev 95514,
branches/rolf/cecil-vbnc/vbnc/rt/source/rt9.sln)
Copied: trunk/mono-basic/vbnc/rt/source/rt9.vbproj (from rev 95514,
branches/rolf/cecil-vbnc/vbnc/rt/source/rt9.vbproj)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches