Remove gtest_discover_tests() from CMakeLists.txt (#1629)
It doesn't seem necessary, makes tests appear twice, with one version
sometimes failing supposedly with a double free().
Rename some fuzztest test cases for clarity/consistency.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e85eb68..48628e3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -174,7 +174,6 @@
target_include_directories(${TEST_NAME} PRIVATE ${GTEST_INCLUDE_DIRS})
target_link_libraries(${TEST_NAME} PRIVATE aviftest_helpers ${ARGN})
link_fuzztest(${TEST_NAME})
- gtest_discover_tests(${TEST_NAME})
add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT "TEST_DATA_DIR=${CMAKE_CURRENT_SOURCE_DIR}/data/")
endmacro()
diff --git a/tests/gtest/avif_fuzztest_dec_incr.cc b/tests/gtest/avif_fuzztest_dec_incr.cc
index 5fc2cf3..b349448 100644
--- a/tests/gtest/avif_fuzztest_dec_incr.cc
+++ b/tests/gtest/avif_fuzztest_dec_incr.cc
@@ -86,7 +86,7 @@
}
}
-FUZZ_TEST(DecodeAvifTest, DecodeIncr)
+FUZZ_TEST(DecodeAvifFuzzTest, DecodeIncr)
.WithDomains(Arbitrary<std::vector<uint8_t>>(), Arbitrary<bool>(),
Arbitrary<bool>(), Arbitrary<bool>())
.WithSeeds({{GetWhiteSinglePixelAvif(), false, false, false}});
diff --git a/tests/gtest/avif_fuzztest_enc_dec.cc b/tests/gtest/avif_fuzztest_enc_dec.cc
index 8ed281c..b319aee 100644
--- a/tests/gtest/avif_fuzztest_enc_dec.cc
+++ b/tests/gtest/avif_fuzztest_enc_dec.cc
@@ -49,7 +49,7 @@
// hard to verify so do not check it.
}
-FUZZ_TEST(EncodeDecodeAvifTest, EncodeDecodeValid)
+FUZZ_TEST(EncodeDecodeAvifFuzzTest, EncodeDecodeValid)
.WithDomains(ArbitraryAvifImage(), ArbitraryAvifEncoder(),
ArbitraryAvifDecoder({AVIF_CODEC_CHOICE_AUTO,
AVIF_CODEC_CHOICE_DAV1D}));
diff --git a/tests/gtest/avif_fuzztest_enc_dec_experimental.cc b/tests/gtest/avif_fuzztest_enc_dec_experimental.cc
index 404599d..1973d50 100644
--- a/tests/gtest/avif_fuzztest_enc_dec_experimental.cc
+++ b/tests/gtest/avif_fuzztest_enc_dec_experimental.cc
@@ -115,7 +115,7 @@
fuzztest::Arbitrary<std::array<uint8_t, sizeof(avifGainMapMetadata)>>());
}
-FUZZ_TEST(EncodeDecodeAvifTest8b, EncodeDecodeValid)
+FUZZ_TEST(EncodeDecodeAvifFuzzTest, EncodeDecodeValid)
.WithDomains(fuzztest::OneOf(ArbitraryAvifImage(),
ArbitraryAvifImageWithGainMap()),
ArbitraryAvifEncoder(),
diff --git a/tests/gtest/avif_fuzztest_enc_dec_incr.cc b/tests/gtest/avif_fuzztest_enc_dec_incr.cc
index 1b30e0b..928026d 100644
--- a/tests/gtest/avif_fuzztest_enc_dec_incr.cc
+++ b/tests/gtest/avif_fuzztest_enc_dec_incr.cc
@@ -67,7 +67,7 @@
/*useNthImageApi=*/true, cell_height);
}
-FUZZ_TEST(EncodeDecodeAvifTest, EncodeDecodeGridValid)
+FUZZ_TEST(EncodeDecodeAvifFuzzTest, EncodeDecodeGridValid)
.WithDomains(ArbitraryAvifImage(), ArbitraryAvifEncoder(),
ArbitraryAvifDecoder({AVIF_CODEC_CHOICE_AUTO}),
/*grid_cols=*/InRange<uint32_t>(1, 32),
diff --git a/tests/gtest/avif_fuzztest_enc_dec_incr_experimental.cc b/tests/gtest/avif_fuzztest_enc_dec_incr_experimental.cc
index 35aa091..da81729 100644
--- a/tests/gtest/avif_fuzztest_enc_dec_incr_experimental.cc
+++ b/tests/gtest/avif_fuzztest_enc_dec_incr_experimental.cc
@@ -111,7 +111,7 @@
fuzztest::Arbitrary<std::array<uint8_t, sizeof(avifGainMapMetadata)>>());
}
-FUZZ_TEST(EncodeDecodeAvifTest, EncodeDecodeGridValid)
+FUZZ_TEST(EncodeDecodeAvifFuzzTest, EncodeDecodeGridValid)
.WithDomains(fuzztest::OneOf(ArbitraryAvifImage(),
ArbitraryAvifImageWithGainMap()),
ArbitraryAvifEncoder(),
diff --git a/tests/gtest/avif_fuzztest_read_image.cc b/tests/gtest/avif_fuzztest_read_image.cc
index e1c2290..de48e4f 100644
--- a/tests/gtest/avif_fuzztest_read_image.cc
+++ b/tests/gtest/avif_fuzztest_read_image.cc
@@ -92,7 +92,7 @@
constexpr uint32_t kMaxFileSize = 1024 * 1024; // 1MB.
-FUZZ_TEST(DecodeAvifTest, ReadImageFile)
+FUZZ_TEST(ReadImageFuzzTest, ReadImageFile)
.WithDomains(
Arbitrary<std::string>()
.WithMaxSize(kMaxFileSize)