diff --git a/.github/workflows/formal.yaml b/.github/workflows/formal.yaml index c7ce741d1..f295197be 100644 --- a/.github/workflows/formal.yaml +++ b/.github/workflows/formal.yaml @@ -34,17 +34,11 @@ jobs: - name: setup env uses: ./.github/actions/build_env - # - uses: Swatinem/rust-cache@v2.7.3 - # with: - # shared-key: "libra-framework" - # cache-all-crates: true - - name: install prover dependencies run: | bash util/dev_setup.sh -byp - # Move framework tests - # TODO: + # Move prover tests - name: prover tests working-directory: ./framework - run: make prove + run: make -f prover.mk prove diff --git a/framework/Makefile b/framework/prover.mk similarity index 76% rename from framework/Makefile rename to framework/prover.mk index ca8ab4294..2aa1ca64f 100644 --- a/framework/Makefile +++ b/framework/prover.mk @@ -10,22 +10,22 @@ prove: @cd move-stdlib && \ echo "Testing move-stdlib" && \ find sources -type f -name "*.move" ! -name "*.spec.move" | sed 's/\.move$$//' | \ - xargs -I {} sh -c 'echo "Testing file: {}"; diem move prove -f {} || echo "Error in file: {}"' + xargs -I {} sh -c 'echo "Testing file: {}"; libra move prove -f {} || echo "Error in file: {}"' @cd vendor-stdlib && \ echo "Testing vendor-stdlib" && \ find sources -type f -name "*.move" ! -name "*.spec.move" | sed 's/\.move$$//' | \ - xargs -I {} sh -c 'echo "Testing file: {}"; diem move prove -f {} || echo "Error in file: {}"' + xargs -I {} sh -c 'echo "Testing file: {}"; libra move prove -f {} || echo "Error in file: {}"' @cd libra-framework && \ for i in ${PROVER_TESTS} ${VENDOR_TESTS}; do \ - diem move prove -f $$i; \ + libra move prove -f $$i; \ done -#TODO: automate libra-framework verification once we have identified and fixed specifications +#TODO: automate libra-framework verification once we have identified and fixed specifications # @cd libra-framework && \ # echo "Testing libra-framework" && \ # find . -type f -name "*.move" ! -name "*.spec.move" -print0 | \ # awk -v RS='\0' -v ORS='\0' '{sub(/^\.\//,""); print}' | \ # sort -uz | \ -# xargs -0 -I {} sh -c 'echo "Testing file: {}"; diem move prove -f {} || echo "Error in file: {}"' \ No newline at end of file +# xargs -0 -I {} sh -c 'echo "Testing file: {}"; diem move prove -f {} || echo "Error in file: {}"'