build-gnu: fix factor tests being re-added by automake during make check #10907
+8
−3
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This isn't the most elegant of fixes, but the reason that we see varying integration test numbers is that if we don't re-use the gnu build from the cache then before we run the tests we will regenerate the test files again which includes all of the files that we patched out and all of the factor tests. This removes all of the patches to the Makefile and also causes the test suite to take double the amount of time to run.
The three changes are: changing the factor total test count to 40 from 37 since this was update upstream, removing all of these tests from the tests/local.mk so that even if in the future we regress and rebuild the tests again it will not have those factor tests, then lastly touching Makefile.in Makefile after all of the modifications to the build files so that when we run make-check it wont rebuild the test files again.
I made a branch to stress test this to validate that it fixes the bug and it appears that it does, but at the same time the conditions don't match the main CI exactly so I'm not 100% confident that this fixes it completely.