Fix sdb work in test suite.

diff --git a/test-suite/MITestHotReloadAsyncStepping/Program.cs b/test-suite/MITestHotReloadAsyncStepping/Program.cs
index c786b550f245e6519014e999c05a1a3fb616bfdf..439a4832fcce9d93f9d01ef72d9d31d08fc25ef1 100644 (file)
--- a/test-suite/MITestHotReloadAsyncStepping/Program.cs
+++ b/test-suite/MITestHotReloadAsyncStepping/Program.cs
@@ -261,7 +261,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadBreak/Program.cs b/test-suite/MITestHotReloadBreak/Program.cs
index 4062b1530d5146355efe5a63bc1287f8a21b8385..afc0b4a0328b722f79da3189dcfcda4280a7fba7 100644 (file)
--- a/test-suite/MITestHotReloadBreak/Program.cs
+++ b/test-suite/MITestHotReloadBreak/Program.cs
@@ -281,7 +281,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadBreakpoint/Program.cs b/test-suite/MITestHotReloadBreakpoint/Program.cs
index 8b5f0d0473bb14a922ac93b4d9a80be263f1a809..5502eddab3295acb5c2ce72e33ae8b1c0cc480f2 100644 (file)
--- a/test-suite/MITestHotReloadBreakpoint/Program.cs
+++ b/test-suite/MITestHotReloadBreakpoint/Program.cs
@@ -196,7 +196,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadEvaluate/Program.cs b/test-suite/MITestHotReloadEvaluate/Program.cs
index 4020a55f32d35e18187c8c3fe2919c88042192c1..53ed5dc4b6cc764524bb28a82bd607cdad4651f1 100644 (file)
--- a/test-suite/MITestHotReloadEvaluate/Program.cs
+++ b/test-suite/MITestHotReloadEvaluate/Program.cs
@@ -208,7 +208,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadJMC/Program.cs b/test-suite/MITestHotReloadJMC/Program.cs
index 56f50a364bc79c6ce2148f63a56268685a0925fa..f9a0f4aa1ce26501721a84ed1c56bdc033e2b521 100644 (file)
--- a/test-suite/MITestHotReloadJMC/Program.cs
+++ b/test-suite/MITestHotReloadJMC/Program.cs
@@ -226,7 +226,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadPDB/Program.cs b/test-suite/MITestHotReloadPDB/Program.cs
index 7f752011ee89ac51fd719472ef1ab7cc28e7f94d..43505379423c168a1eff4339e1aa45689659b361 100644 (file)
--- a/test-suite/MITestHotReloadPDB/Program.cs
+++ b/test-suite/MITestHotReloadPDB/Program.cs
@@ -196,7 +196,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadStepping/Program.cs b/test-suite/MITestHotReloadStepping/Program.cs
index bad9c303a229c32af24a1342a4dfb14b25979b59..4326b557b32fc9dc4a36d93e34ecb93cfdd3878e 100644 (file)
--- a/test-suite/MITestHotReloadStepping/Program.cs
+++ b/test-suite/MITestHotReloadStepping/Program.cs
@@ -297,7 +297,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadUpdate/Program.cs b/test-suite/MITestHotReloadUpdate/Program.cs
index 60aa0e01b0fcd88e6bb7bc3c242511dfa6a98a09..bb1fd329cf11204f83274b830554dcb08114d365 100644 (file)
--- a/test-suite/MITestHotReloadUpdate/Program.cs
+++ b/test-suite/MITestHotReloadUpdate/Program.cs
@@ -232,7 +232,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/MITestHotReloadWithoutBreak/Program.cs b/test-suite/MITestHotReloadWithoutBreak/Program.cs
index 06dd417b8baa3a10b94336f786b897377f638b5c..e05aa38645069b451464ef0e856919a6bd4a6f18 100644 (file)
--- a/test-suite/MITestHotReloadWithoutBreak/Program.cs
+++ b/test-suite/MITestHotReloadWithoutBreak/Program.cs
@@ -183,7 +183,7 @@ namespace NetcoreDbgTest.Script
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))\r
             {\r
                 process.StartInfo.FileName = "bash";\r
-                process.StartInfo.Arguments = "-c \"sdb push " + hostFullPath + " " + targetPath + "\"";\r
+                process.StartInfo.Arguments = "-c \"" + ControlInfo.SDB + " push " + hostFullPath + " " + targetPath + "\"";\r
             }\r
             else\r
                 throw new Exception("Host OS not supported. " + @"__FILE__:__LINE__"+"\n"+caller_trace);\r

diff --git a/test-suite/NetcoreDbgTest/ControlInfo.cs b/test-suite/NetcoreDbgTest/ControlInfo.cs
index 80d1e54fc7316d597c51a8b78a9ed097fecc3000..b977a7dca1b6baadeecd263fc01bdacdc372adfe 100644 (file)
--- a/test-suite/NetcoreDbgTest/ControlInfo.cs
+++ b/test-suite/NetcoreDbgTest/ControlInfo.cs
@@ -10,6 +10,7 @@ namespace NetcoreDbgTest
         public string SourceFilesPath { get; private set; }
         public string TargetAssemblyPath { get; private set; }
         public string CorerunPath { get; private set; }
+        public string SDB { get; private set; }
 
         public ControlInfo(ControlScript script,
                            NetcoreDbgTestCore.Environment env)
@@ -19,6 +20,7 @@ namespace NetcoreDbgTest
             SourceFilesPath = env.SourceFilesPath;
             TargetAssemblyPath = env.TargetAssemblyPath;
             CorerunPath = env.CorerunPath;
+            SDB = env.SDB;
         }
     }
 }

diff --git a/test-suite/NetcoreDbgTest/ControlPart.cs b/test-suite/NetcoreDbgTest/ControlPart.cs
index ea5bf7e62e9df94d6297f880b3f26b92135944db..fbefdaad94fdfbe1a865691c55c90fdc4bffa0c8 100644 (file)
--- a/test-suite/NetcoreDbgTest/ControlPart.cs
+++ b/test-suite/NetcoreDbgTest/ControlPart.cs
@@ -21,5 +21,6 @@ namespace NetcoreDbgTestCore
         public string SourceFilesPath = null;
         public string TargetAssemblyPath = null;
         public string CorerunPath = "dotnet";
+        public string SDB = "sdb";
     }
 }

diff --git a/test-suite/TestRunner/TestRunner.cs b/test-suite/TestRunner/TestRunner.cs
index 7dcf6f4ec43c11068c5c2a47edbc388f601ee191..641411b32e9bdc7d638c842a7cf53cb1ca74c66d 100644 (file)
--- a/test-suite/TestRunner/TestRunner.cs
+++ b/test-suite/TestRunner/TestRunner.cs
@@ -280,6 +280,17 @@ namespace TestRunner
 
                     i += 2;
 
+                    break;
+                case "--sdb":
+                    if (i + 1 >= args.Length) {
+                        NeedHelp = true;
+                        break;
+                    }
+
+                    Environment.SDB = args[i + 1];
+
+                    i += 2;
+
                     break;
                 default:
                     NeedHelp = true;

diff --git a/test-suite/sdb_run_tests.sh b/test-suite/sdb_run_tests.sh
index 702fb837fc91c1d89e30d53de0fecee69175974d..6865e5f5bddcd544af274b3053c6fe556888f348 100755 (executable)
--- a/test-suite/sdb_run_tests.sh
+++ b/test-suite/sdb_run_tests.sh
@@ -247,6 +247,7 @@ for TEST_NAME in $TEST_NAMES; do
         $DOTNET run --project TestRunner -- \
             --tcp localhost $PORT \
             --proto $PROTO \
+            --sdb "$SDB" \
             --test $TEST_NAME \
             --sources $SOURCE_FILES \
             --assembly $REMOTETESTDIR/$TEST_PROJ_NAME.dll
@@ -262,6 +263,7 @@ for TEST_NAME in $TEST_NAMES; do
             --tcp localhost $PORT \
             --dotnet /usr/bin/dotnet \
             --proto $PROTO \
+            --sdb "$SDB" \
             --test $TEST_NAME \
             --sources "$SOURCE_FILES" \
             --assembly $REMOTETESTDIR/$TEST_PROJ_NAME.dll