Merge "fortify: remove `pragma diagnostic error` from tests"