diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1cea077888..de1c6cd26a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -762,6 +762,7 @@ jobs: with: command: | mkdir -p measurements-${{ env.MEASUREMENTS_ID }}/ + ls -lh measurements-${{ env.MEASUREMENTS_ID }}/ scripts/for_all_contracts_exec2.sh --path integration-tests \ --ignore solidity-abi/sol-cross-contract --ignore solidity-abi/sol-encoding \ --ignore solidity-abi/solidity-calls-flipper --ignore solidity-abi/events \ @@ -770,6 +771,7 @@ jobs: --ignore solidity-abi/sol-cross-contract/other-contract-sol \ --ignore solidity-abi/trait-dyn-cross-contract-calls/contracts/incrementer -- \ scripts/build_and_determine_contract_size.sh {} + ls -lh measurements-${{ env.MEASUREMENTS_ID }}/ # NOTE: Sharing build artifacts (i.e. via a shared cargo target directory) with other contracts # that don't have the same ABI set makes the builds fail. diff --git a/integration-tests/public/contract-transfer/Cargo.toml b/integration-tests/public/contract-transfer/Cargo.toml index 9e6b79d6db..ff79ea2284 100644 --- a/integration-tests/public/contract-transfer/Cargo.toml +++ b/integration-tests/public/contract-transfer/Cargo.toml @@ -9,8 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false, features = ["unstable-hostfn"] } [dev-dependencies] -#ink_e2e = { path = "../../../crates/e2e" } -ink_e2e = { path = "../../../crates/e2e", features = ["sandbox"] } +ink_e2e = { path = "../../../crates/e2e" } [lib] path = "lib.rs" @@ -24,4 +23,4 @@ ink-as-dependency = [] e2e-tests = [] [package.metadata.ink-lang] -abi = "ink" +abi = "sol" diff --git a/integration-tests/public/contract-transfer/lib.rs b/integration-tests/public/contract-transfer/lib.rs index a9828b3942..dd69c895d0 100644 --- a/integration-tests/public/contract-transfer/lib.rs +++ b/integration-tests/public/contract-transfer/lib.rs @@ -199,7 +199,6 @@ pub mod give_me { type E2EResult = std::result::Result>; #[ink_e2e::test] - //#[ink_e2e::test(backend(runtime_only))] async fn e2e_sending_value_to_give_me_must_fail( mut client: Client, ) -> E2EResult<()> { @@ -235,8 +234,7 @@ pub mod give_me { Ok(()) } - //#[ink_e2e::test] - #[ink_e2e::test(backend(runtime_only))] + #[ink_e2e::test] async fn e2e_contract_must_transfer_value_to_sender( mut client: Client, ) -> E2EResult<()> { diff --git a/scripts/for_all_contracts_exec2.sh b/scripts/for_all_contracts_exec2.sh index 87b3462c58..5a252f6c3b 100755 --- a/scripts/for_all_contracts_exec2.sh +++ b/scripts/for_all_contracts_exec2.sh @@ -139,16 +139,25 @@ fi for (( i = start; i <= end; i++ )); do manifest_path="${filtered_manifests[$i]}" + echo "manifest_path" $manifest_path >&2 example="$(dirname "$manifest_path" | cut -d'/' -f3)" echo "example" $example >&2 - #export CONTRACT_SIZE_FILE="$CONTRACT_SIZE_FILE$manifest_parent" - #echo $CONTRACT_SIZE_FILE >&2 + size_file="$CONTRACT_SIZE_FILE$example" + echo "size_file" $size_file >&2 command[$arg_index]="$manifest_path" if [ "$quiet" = false ]; then >&2 echo Running: "${command[@]}" fi - eval "${command[@]}" >> ${CONTRACT_SIZE_FILE}$example - sed -ie 's/^integration-tests\/\(public\/\|internal\/\)\?//' ${CONTRACT_SIZE_FILE}$example + echo "writing to " $size_file >&2 + echo "command: ${command[@]} >> $size_file" + ls -lh measurements-* >&2 + eval "${command[@]}" >> $size_file + ls -lh ${CONTRACT_SIZE_FILE}$example* >&2 + sed -ie 's/^integration-tests\/\(public\/\|internal\/\)\?//' $size_file + ls -lh ${CONTRACT_SIZE_FILE}$example* >&2 + echo "cat: " + cat ${CONTRACT_SIZE_FILE}$example >&2 + echo "" >&2 if [ $? -eq 0 ]; then successes+=("$manifest_path")