Skip to content

Update build-results call sites to results-build #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jnasbyupgrade wants to merge 1 commit into from
Closed

Update build-results call sites to results-build #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test/standard/make-test.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,17 +580,17 @@ EOF
}

# ============================================================================
# build-results (issue #108)
# results-build (issue #108)
# ============================================================================
#
# build-results mirrors `make results`, but for test-build's separate
# results-build mirrors `make results`, but for test-build's separate
# pg_regress pass: bless test/build/'s actual output as the new expected
# output. Unlike `make results`, it refuses to bless any file whose actual
# output contains an "ERROR:" line -- see base.mk's build-results comment
# output contains an "ERROR:" line -- see base.mk's results-build comment
# for why that's essential (blessing an errored build as the new baseline
# would defeat the entire point of test-build gating the main suite).

@test "build-results refreshes a stale test/build/expected/*.out" {
@test "results-build refreshes a stale test/build/expected/*.out" {
skip_if_no_postgres

# Corrupt the committed expected output (stale, not a real build break).
Expand All @@ -599,16 +599,16 @@ EOF
run git status --porcelain test/build/expected/build_check.out
[ -n "$output" ] || error "corruption didn't register as a git modification"

run make build-results
run make results-build
assert_success

# The template's build_check.sql is deterministic, so a correct refresh
# must land back on exactly the committed content.
run git status --porcelain test/build/expected/build_check.out
[ -z "$output" ] || error "build_check.out doesn't match the committed baseline after build-results: $output"
[ -z "$output" ] || error "build_check.out doesn't match the committed baseline after results-build: $output"
}

@test "build-results skips a file whose actual output contains ERROR:, but still refreshes clean files" {
@test "results-build skips a file whose actual output contains ERROR:, but still refreshes clean files" {
skip_if_no_postgres

# Re-corrupt build_check.out (clean, no ERROR) so this test can prove it
Expand All @@ -619,7 +619,7 @@ EOF
# Force simple_build_test.sql to error.
echo "SELECT * FROM definitely_nonexistent_table;" >> test/build/simple_build_test.sql

run make build-results
run make results-build
assert_failure
assert_contains "$output" "simple_build_test.out"
assert_contains "$output" "cp test/build/results/simple_build_test.out test/build/expected/simple_build_test.out"
Expand Down
Loading