diff options
author | Justin Clark-Casey (justincc) | 2014-05-27 18:37:16 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-05-27 18:37:16 +0100 |
commit | 394ec508f6b0b8c2731448d49cafedaaded273b7 (patch) | |
tree | f09817f761dc8f28fcb1086077aed1878782c271 /OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | |
parent | Temporarily print regression TestCastAndConcatString() script compile errors ... (diff) | |
download | opensim-SC_OLD-394ec508f6b0b8c2731448d49cafedaaded273b7.zip opensim-SC_OLD-394ec508f6b0b8c2731448d49cafedaaded273b7.tar.gz opensim-SC_OLD-394ec508f6b0b8c2731448d49cafedaaded273b7.tar.bz2 opensim-SC_OLD-394ec508f6b0b8c2731448d49cafedaaded273b7.tar.xz |
Make CompilerTest add same AssemblyResolver as XEngine to see if this solves the issue with different AppDomain BaseDirectory in local and Jenkins test runs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs index 3647467..75b7244 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.IO; | 29 | using System.IO; |
29 | using System.CodeDom.Compiler; | 30 | using System.CodeDom.Compiler; |
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
@@ -67,7 +68,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
67 | m_CSCodeProvider = new CSharpCodeProvider(); | 68 | m_CSCodeProvider = new CSharpCodeProvider(); |
68 | m_compilerParameters = new CompilerParameters(); | 69 | m_compilerParameters = new CompilerParameters(); |
69 | 70 | ||
70 | string rootPath = Path.Combine(Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory)); | 71 | string rootPath = System.AppDomain.CurrentDomain.BaseDirectory; |
72 | |||
73 | System.AppDomain.CurrentDomain.AssemblyResolve += | ||
74 | new ResolveEventHandler( | ||
75 | AssemblyResolver.OnAssemblyResolve); | ||
76 | |||
71 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); | 77 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); |
72 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); | 78 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); |
73 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); | 79 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); |