Smoketests work on macos (#15)

* Some work * Getting smoketests working on mac * All tests are passing except known failing tests --------- Co-authored-by: Boppy <no-reply@boppygames.gg>
clockworklabs · Aug 1, 2023 · cd8ddd2 · cd8ddd2
1 parent 18121fb
commit cd8ddd2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/test/lib.include b/test/lib.include
@@ -71,3 +71,13 @@ spacetime_publish() {
 	set -e
 	return "$RESULT_CODE"
 }
+
+fsed() {
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+        sed -i.sed_bak "$@"
+        rm -f rm *.sed_bak
+	else
+        sed -i "$@"
+	fi
+}
+
diff --git a/test/tests/autoinc1.sh b/test/tests/autoinc1.sh
@@ -12,7 +12,7 @@ source "./test/lib.include"
 do_test() {
   echo "RUNNING TEST FOR VALUE: $1"
   create_project
-  
+
   cat > "${PROJECT_PATH}/src/lib.rs" << EOF
 use spacetimedb::{println, spacetimedb};
 
@@ -38,12 +38,12 @@ pub fn say_hello() {
 }
 EOF
 
-  sed -i "s/REPLACE_VALUE/$1/g" "${PROJECT_PATH}/src/lib.rs"
-  
-  run_test cargo run publish --project-path "$PROJECT_PATH" --clear-database
+  fsed "s/REPLACE_VALUE/$1/g" "${PROJECT_PATH}/src/lib.rs"
+
+  run_test cargo run publish --project-path "$PROJECT_PATH" --clear-database -d -s
   [ "1" == "$(grep -c "reated new database" "$TEST_OUT")" ]
   IDENT="$(grep "reated new database" "$TEST_OUT" | awk 'NF>1{print $NF}')"
-  
+
   run_test cargo run call "$IDENT" add '["Robert", 1]'
   run_test cargo run call "$IDENT" add '["Julie", 2]'
   run_test cargo run call "$IDENT" add '["Samantha", 3]'

diff --git a/test/tests/autoinc2.sh b/test/tests/autoinc2.sh
@@ -12,7 +12,7 @@ source "./test/lib.include"
 do_test() {
   echo "RUNNING TEST FOR VALUE: $1"
   create_project
-  
+
   cat > "${PROJECT_PATH}/src/lib.rs" << EOF
 use spacetimedb::{println, spacetimedb};
 
@@ -46,12 +46,12 @@ pub fn say_hello() {
 }
 EOF
 
-  sed -i "s/REPLACE_VALUE/$1/g" "${PROJECT_PATH}/src/lib.rs"
-  
+  fsed "s/REPLACE_VALUE/$1/g" "${PROJECT_PATH}/src/lib.rs"
+
   run_test cargo run publish --project-path "$PROJECT_PATH" --clear-database
   [ "1" == "$(grep -c "reated new database" "$TEST_OUT")" ]
   IDENT="$(grep "reated new database" "$TEST_OUT" | awk 'NF>1{print $NF}')"
-  
+
   run_test cargo run call "$IDENT" update '["Robert", 2]'
   run_test cargo run call "$IDENT" add_new '["Success"]'
   if run_test cargo run call "$IDENT" add_new '["Failure"]' ; then