From 321f8ecf7944af121fc2425973eba458321c5015 Mon Sep 17 00:00:00 2001
From: Harrison <yunyangdeng@gmail.com>
Date: Mon, 24 Feb 2020 03:43:57 -0500
Subject: [PATCH] Separated builds and tests.

---
 jenkins_build.sh | 18 ++++++++++++++++--
 jenkins_test.sh  |  7 ++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/jenkins_build.sh b/jenkins_build.sh
index bd5a177..cac72d9 100644
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@@ -2,5 +2,19 @@
 #Create directories if not created.
 mkdir -p TestFiles/NUnit.Runners
 nuget install Nunit.Runners -OutputDirectory TestFiles/NUnit.Runners
-dotnet restore RecrownedGTK.sln
-msbuild RecrownedGTK.sln
\ No newline at end of file
+
+#Build RecrownedGTK and tests.
+echo "Building RecrownedGTK..."
+nuget restore RecrownedGTK/RecrownedGTK.csproj
+msbuild RecrownedGTK/RecrownedGTK.csproj
+echo "Building RecrownedGTK.Tests..."
+nuget restore RecrownedGTK.Tests/RecrownedGTK.Tests.csproj
+msbuild RecrownedGTK.Tests/RecrownedGTK.Tests.csproj
+
+#Build RecrownedGTK.Tools and tests.
+echo "Building RecrownedGTK.Tools..."
+nuget restore RecrownedGTK.Tools/RecrownedGTK.Tools.csproj
+msbuild RecrownedGTK.Tools/RecrownedGTK.Tools.csproj
+echo "Building RecrownedGTK.Tools.Tests..."
+nuget restore RecrownedGTK.Tools.Tests/RecrownedGTK.Tools.Tests.csproj
+msbuild RecrownedGTK.Tools.Tests/RecrownedGTK.Tools.Tests.csproj
\ No newline at end of file
diff --git a/jenkins_test.sh b/jenkins_test.sh
index 4fe1aed..3957ed8 100644
--- a/jenkins_test.sh
+++ b/jenkins_test.sh
@@ -1,3 +1,4 @@
-mkdir -p TestFiles/Results
-TestFiles/NUnit.Runners/NUnit.ConsoleRunner.3.11.1/tools/nunit3-console.exe RecrownedGTK.sln --result=nunit3 --output "Results/build_${BUILD_ID}_log.txt" --work="TestFiles"
-cp TestFiles/nunit3 "TestFiles/Results/build_${BUILD_ID}_results.xml"
\ No newline at end of file
+#!/bin/sh
+#Tests
+mkdir -p TestFiles
+TestFiles/NUnit.Runners/NUnit.ConsoleRunner.3.11.1/tools/nunit3-console.exe "RecrownedGTK.Tests/RecrownedGTK.Tests.csproj" "RecrownedGTK.Tools.Tests/RecrownedGTK.Tools.Tests.csproj" --result=nunit3 --work="TestFiles"
\ No newline at end of file