From 545d0249548d953aaa2f59f48dd83d0ce6904217 Mon Sep 17 00:00:00 2001 From: Boppy Date: Thu, 22 Jun 2023 21:18:51 -0500 Subject: [PATCH 1/3] Some work --- test/lib.include | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/lib.include b/test/lib.include index 6da056889cc..0b99372be27 100644 --- a/test/lib.include +++ b/test/lib.include @@ -71,3 +71,13 @@ spacetime_publish() { set -e return "$RESULT_CODE" } + +ssed() { + if [[ "$OSTYPE" == "darwin"* ]]; then + sed -i.sed_bak "$@" + rm -f rm *.sed_bak + else + sed "$@" + fi +} + From c7792788bea3c34d1c0dcb924aae94f4d2499824 Mon Sep 17 00:00:00 2001 From: Boppy Date: Thu, 22 Jun 2023 22:23:48 -0500 Subject: [PATCH 2/3] Getting smoketests working on mac --- test/lib.include | 4 ++-- test/tests/autoinc1.sh | 10 +++++----- test/tests/autoinc2.sh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/lib.include b/test/lib.include index 0b99372be27..24ad76c69b0 100644 --- a/test/lib.include +++ b/test/lib.include @@ -72,12 +72,12 @@ spacetime_publish() { return "$RESULT_CODE" } -ssed() { +fsed() { if [[ "$OSTYPE" == "darwin"* ]]; then sed -i.sed_bak "$@" rm -f rm *.sed_bak else - sed "$@" + sed -i "$@" fi } diff --git a/test/tests/autoinc1.sh b/test/tests/autoinc1.sh index ea6167b06a2..a1ea8874497 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 bb8e1bd57e8..79b63c478dc 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 -i "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 From 556b180e98ac238079a8cb95d7081928a06ff446 Mon Sep 17 00:00:00 2001 From: Boppy Date: Thu, 22 Jun 2023 22:53:48 -0500 Subject: [PATCH 3/3] All tests are passing except known failing tests --- test/tests/autoinc2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tests/autoinc2.sh b/test/tests/autoinc2.sh index 79b63c478dc..2b185bf72d3 100644 --- a/test/tests/autoinc2.sh +++ b/test/tests/autoinc2.sh @@ -46,7 +46,7 @@ pub fn say_hello() { } EOF - fsed -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")" ]