diff --git a/.gitignore b/.gitignore index b08a72e..46d8618 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ # CLion Shit -cmake-build-* +build diff --git a/Assignment1/.idea/runConfigurations/Build_on_Lab.xml b/Assignment1/.idea/runConfigurations/Build_on_Lab.xml new file mode 100644 index 0000000..7a8c804 --- /dev/null +++ b/Assignment1/.idea/runConfigurations/Build_on_Lab.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/Assignment1/.idea/runConfigurations/Run_on_Lab.xml b/Assignment1/.idea/runConfigurations/Run_on_Lab.xml new file mode 100644 index 0000000..72a6585 --- /dev/null +++ b/Assignment1/.idea/runConfigurations/Run_on_Lab.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/Assignment1/.idea/runConfigurations/Test_on_Lab.xml b/Assignment1/.idea/runConfigurations/Test_on_Lab.xml new file mode 100644 index 0000000..de2711a --- /dev/null +++ b/Assignment1/.idea/runConfigurations/Test_on_Lab.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/Assignment1/.idea/vcs.xml b/Assignment1/.idea/vcs.xml new file mode 100644 index 0000000..2e3f692 --- /dev/null +++ b/Assignment1/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assignment1/CMakeLists.txt b/Assignment1/CMakeLists.txt index b5cf30d..1a0c847 100644 --- a/Assignment1/CMakeLists.txt +++ b/Assignment1/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(Assignment1 C) set(CMAKE_C_STANDARD 11) diff --git a/Assignment1/tests/build.ps1 b/Assignment1/tests/build.ps1 new file mode 100644 index 0000000..a2617c2 --- /dev/null +++ b/Assignment1/tests/build.ps1 @@ -0,0 +1,3 @@ +ssh ishoebot@remotelabm35.cs.unb.ca "cd ~/build/; rm -rf $($args[0]); mkdir $($args[0])" +scp -r $(Get-Location) ishoebot@remotelabm35.cs.unb.ca:~/build/ +ssh ishoebot@remotelabm35.cs.unb.ca "cd ~/build/$($args[0])/; rm -rf build/; chmod +x ./tests/build.sh; ./tests/build.sh $($args[0])" \ No newline at end of file diff --git a/Assignment1/tests/build.sh b/Assignment1/tests/build.sh new file mode 100644 index 0000000..68836d6 --- /dev/null +++ b/Assignment1/tests/build.sh @@ -0,0 +1,5 @@ +cd ~/build/"$1"/ || exit +mkdir build +cd build || exit +cmake -DCMAKE_BUILD_TYPE=Debug -G "CodeBlocks - Unix Makefiles" ../ +make \ No newline at end of file diff --git a/Assignment1/tests/run.ps1 b/Assignment1/tests/run.ps1 new file mode 100644 index 0000000..f2ed9f4 --- /dev/null +++ b/Assignment1/tests/run.ps1 @@ -0,0 +1 @@ +ssh -t ishoebot@remotelabm35.cs.unb.ca "~/build/$($args[0])/build/$($args[0])" \ No newline at end of file diff --git a/Assignment1/tests/test.ps1 b/Assignment1/tests/test.ps1 new file mode 100644 index 0000000..d6d1e22 --- /dev/null +++ b/Assignment1/tests/test.ps1 @@ -0,0 +1 @@ +ssh ishoebot@remotelabm35.cs.unb.ca "cd ~/build/$($args[0])/tests/; chmod +x test.sh; ./test.sh $($args[0])" \ No newline at end of file diff --git a/Assignment1/tests/test.sh b/Assignment1/tests/test.sh index 2314a1f..e8fc2cf 100644 --- a/Assignment1/tests/test.sh +++ b/Assignment1/tests/test.sh @@ -19,7 +19,7 @@ function test() { # Check if the files exist and if not, create them files "$1" - ../cmake-build-debug-wsl/Assignment1 < "$1.txt" > "$1_Result.txt" + "$(pwd)"/../build/Assignment1 < "$1.txt" > "$1_Result.txt" if diff -u "$1_Result.txt" "$1_Expected.txt"; then echo "$1 test passed"