diff --git a/test/lib.include b/test/lib.include index 6da056889c..24ad76c69b 100644 --- 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 index ea6167b06a..a1ea887449 100644 --- 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 index bb8e1bd57e..2b185bf72d 100644 --- 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