diff --git a/test/fuzzing/CMakeLists.txt b/test/fuzzing/CMakeLists.txt index 2a45ef649..577d13cea 100644 --- a/test/fuzzing/CMakeLists.txt +++ b/test/fuzzing/CMakeLists.txt @@ -2,7 +2,6 @@ if (HB_CHECK) file (READ "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.am" MAKEFILEAM) extract_make_variable (hb_shape_fuzzer_SOURCES ${MAKEFILEAM}) extract_make_variable (hb_subset_fuzzer_SOURCES ${MAKEFILEAM}) - extract_make_variable (hb_subset_get_codepoints_fuzzer_SOURCES ${MAKEFILEAM}) # TODO: enable these two #extract_make_variable (FUZZING_CPPFLAGS ${MAKEFILEAM}) # extracting regex fail @@ -16,17 +15,13 @@ if (HB_CHECK) add_executable (hb-subset-fuzzer ${hb_subset_fuzzer_SOURCES}) target_link_libraries (hb-subset-fuzzer harfbuzz-subset) - add_executable (hb-subset-get-codepoints-fuzzer ${hb_subset_get_codepoints_fuzzer_SOURCES}) - target_link_libraries (hb-subset-get-codepoints-fuzzer harfbuzz-subset) - target_compile_definitions(hb-shape-fuzzer PUBLIC ${FUZZING_CPPFLAGS}) target_compile_definitions(hb-subset-fuzzer PUBLIC ${FUZZING_CPPFLAGS}) - target_compile_definitions(hb-subset-get-codepoints-fuzzer PUBLIC ${FUZZING_CPPFLAGS}) add_test (NAME hb-shape-fuzzer COMMAND "${PYTHON_EXECUTABLE}" run-shape-fuzzer-tests.py $ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) add_test (NAME hb-subset-fuzzer - COMMAND "${PYTHON_EXECUTABLE}" run-subset-fuzzer-tests.py $ $ + COMMAND "${PYTHON_EXECUTABLE}" run-subset-fuzzer-tests.py $ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endif () diff --git a/test/fuzzing/run-subset-fuzzer-tests.py b/test/fuzzing/run-subset-fuzzer-tests.py index 013628860..ff4440baa 100755 --- a/test/fuzzing/run-subset-fuzzer-tests.py +++ b/test/fuzzing/run-subset-fuzzer-tests.py @@ -8,7 +8,6 @@ srcdir = os.environ.get ("srcdir", ".") EXEEXT = os.environ.get ("EXEEXT", "") top_builddir = os.environ.get ("top_builddir", ".") hb_subset_fuzzer = os.path.join (top_builddir, "hb-subset-fuzzer" + EXEEXT) -hb_subset_get_codepoints_fuzzer = os.path.join (top_builddir, "hb-subset-get-codepoints-fuzzer" + EXEEXT) if not os.path.exists (hb_subset_fuzzer): if len (sys.argv) < 2 or not os.path.exists (sys.argv[1]): @@ -18,14 +17,6 @@ please provide it as the first argument to the tool""") hb_subset_fuzzer = sys.argv[1] -if not os.path.exists (hb_subset_get_codepoints_fuzzer): - if len (sys.argv) < 3 or not os.path.exists (sys.argv[2]): - print ("""Failed to find hb-subset-get-codepoints-fuzzer binary automatically, -please provide it as the second argument to the tool""") - sys.exit (1) - - hb_subset_get_codepoints_fuzzer = sys.argv[2] - print ('hb_subset_fuzzer:', hb_subset_fuzzer) fails = 0 @@ -41,9 +32,6 @@ for file in os.listdir (parent_path): print ("failed for %s" % path) fails = fails + 1 - print ("running subset get codepoints fuzzer against %s" % path) - p = subprocess.Popen ([hb_subset_get_codepoints_fuzzer, path]) - if p.wait () != 0: print ("failed for %s" % path) fails = fails + 1