From 56f846cf74961eecd00242276dd566e1b6134e10 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 8 Dec 2022 10:39:54 +0700 Subject: [PATCH] move fuzz into test/fuzz --- fuzz/device/cdc/skip.txt | 1 - fuzz/device/msc/skip.txt | 1 - fuzz/device/net/skip.txt | 1 - {fuzz => test/fuzz}/dcd_fuzz.cc | 0 {fuzz => test/fuzz}/device/cdc/CMakeLists.txt | 0 {fuzz => test/fuzz}/device/cdc/Makefile | 2 +- {fuzz => test/fuzz}/device/cdc/src/fuzz.cc | 0 {fuzz => test/fuzz}/device/cdc/src/tusb_config.h | 0 {fuzz => test/fuzz}/device/cdc/src/usb_descriptors.cc | 0 {fuzz => test/fuzz}/device/msc/CMakeLists.txt | 0 {fuzz => test/fuzz}/device/msc/Makefile | 2 +- {fuzz => test/fuzz}/device/msc/src/fuzz.cc | 0 {fuzz => test/fuzz}/device/msc/src/tusb_config.h | 0 {fuzz => test/fuzz}/device/msc/src/usb_descriptors.cc | 0 {fuzz => test/fuzz}/device/net/CMakeLists.txt | 0 {fuzz => test/fuzz}/device/net/Makefile | 2 +- {fuzz => test/fuzz}/device/net/src/arch/cc.h | 0 {fuzz => test/fuzz}/device/net/src/fuzz.cc | 0 {fuzz => test/fuzz}/device/net/src/lwipopts.h | 0 {fuzz => test/fuzz}/device/net/src/tusb_config.h | 0 {fuzz => test/fuzz}/device/net/src/usb_descriptors.cc | 0 {fuzz => test/fuzz}/dicts/cdc.dict | 0 {fuzz => test/fuzz}/fuzz.cc | 0 {fuzz => test/fuzz}/fuzz.h | 0 {fuzz => test/fuzz}/fuzz_private.h | 0 {fuzz => test/fuzz}/make.mk | 2 +- {fuzz => test/fuzz}/msc_fuzz.cc | 0 {fuzz => test/fuzz}/net_fuzz.cc | 0 {fuzz => test/fuzz}/rules.mk | 10 +++++----- {fuzz => test/fuzz}/usbd_fuzz.cc | 0 30 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 fuzz/device/cdc/skip.txt delete mode 100644 fuzz/device/msc/skip.txt delete mode 100644 fuzz/device/net/skip.txt rename {fuzz => test/fuzz}/dcd_fuzz.cc (100%) rename {fuzz => test/fuzz}/device/cdc/CMakeLists.txt (100%) rename {fuzz => test/fuzz}/device/cdc/Makefile (86%) rename {fuzz => test/fuzz}/device/cdc/src/fuzz.cc (100%) rename {fuzz => test/fuzz}/device/cdc/src/tusb_config.h (100%) rename {fuzz => test/fuzz}/device/cdc/src/usb_descriptors.cc (100%) rename {fuzz => test/fuzz}/device/msc/CMakeLists.txt (100%) rename {fuzz => test/fuzz}/device/msc/Makefile (86%) rename {fuzz => test/fuzz}/device/msc/src/fuzz.cc (100%) rename {fuzz => test/fuzz}/device/msc/src/tusb_config.h (100%) rename {fuzz => test/fuzz}/device/msc/src/usb_descriptors.cc (100%) rename {fuzz => test/fuzz}/device/net/CMakeLists.txt (100%) rename {fuzz => test/fuzz}/device/net/Makefile (98%) rename {fuzz => test/fuzz}/device/net/src/arch/cc.h (100%) rename {fuzz => test/fuzz}/device/net/src/fuzz.cc (100%) rename {fuzz => test/fuzz}/device/net/src/lwipopts.h (100%) rename {fuzz => test/fuzz}/device/net/src/tusb_config.h (100%) rename {fuzz => test/fuzz}/device/net/src/usb_descriptors.cc (100%) rename {fuzz => test/fuzz}/dicts/cdc.dict (100%) rename {fuzz => test/fuzz}/fuzz.cc (100%) rename {fuzz => test/fuzz}/fuzz.h (100%) rename {fuzz => test/fuzz}/fuzz_private.h (100%) rename {fuzz => test/fuzz}/make.mk (98%) rename {fuzz => test/fuzz}/msc_fuzz.cc (100%) rename {fuzz => test/fuzz}/net_fuzz.cc (100%) rename {fuzz => test/fuzz}/rules.mk (96%) rename {fuzz => test/fuzz}/usbd_fuzz.cc (100%) diff --git a/fuzz/device/cdc/skip.txt b/fuzz/device/cdc/skip.txt deleted file mode 100644 index d844feae..00000000 --- a/fuzz/device/cdc/skip.txt +++ /dev/null @@ -1 +0,0 @@ -mcu:SAMD11 \ No newline at end of file diff --git a/fuzz/device/msc/skip.txt b/fuzz/device/msc/skip.txt deleted file mode 100644 index d844feae..00000000 --- a/fuzz/device/msc/skip.txt +++ /dev/null @@ -1 +0,0 @@ -mcu:SAMD11 \ No newline at end of file diff --git a/fuzz/device/net/skip.txt b/fuzz/device/net/skip.txt deleted file mode 100644 index d844feae..00000000 --- a/fuzz/device/net/skip.txt +++ /dev/null @@ -1 +0,0 @@ -mcu:SAMD11 \ No newline at end of file diff --git a/fuzz/dcd_fuzz.cc b/test/fuzz/dcd_fuzz.cc similarity index 100% rename from fuzz/dcd_fuzz.cc rename to test/fuzz/dcd_fuzz.cc diff --git a/fuzz/device/cdc/CMakeLists.txt b/test/fuzz/device/cdc/CMakeLists.txt similarity index 100% rename from fuzz/device/cdc/CMakeLists.txt rename to test/fuzz/device/cdc/CMakeLists.txt diff --git a/fuzz/device/cdc/Makefile b/test/fuzz/device/cdc/Makefile similarity index 86% rename from fuzz/device/cdc/Makefile rename to test/fuzz/device/cdc/Makefile index 76a43923..ee51936b 100644 --- a/fuzz/device/cdc/Makefile +++ b/test/fuzz/device/cdc/Makefile @@ -1,4 +1,4 @@ -include ../../../tools/top.mk +include ../../../../tools/top.mk include ../../make.mk INC += \ diff --git a/fuzz/device/cdc/src/fuzz.cc b/test/fuzz/device/cdc/src/fuzz.cc similarity index 100% rename from fuzz/device/cdc/src/fuzz.cc rename to test/fuzz/device/cdc/src/fuzz.cc diff --git a/fuzz/device/cdc/src/tusb_config.h b/test/fuzz/device/cdc/src/tusb_config.h similarity index 100% rename from fuzz/device/cdc/src/tusb_config.h rename to test/fuzz/device/cdc/src/tusb_config.h diff --git a/fuzz/device/cdc/src/usb_descriptors.cc b/test/fuzz/device/cdc/src/usb_descriptors.cc similarity index 100% rename from fuzz/device/cdc/src/usb_descriptors.cc rename to test/fuzz/device/cdc/src/usb_descriptors.cc diff --git a/fuzz/device/msc/CMakeLists.txt b/test/fuzz/device/msc/CMakeLists.txt similarity index 100% rename from fuzz/device/msc/CMakeLists.txt rename to test/fuzz/device/msc/CMakeLists.txt diff --git a/fuzz/device/msc/Makefile b/test/fuzz/device/msc/Makefile similarity index 86% rename from fuzz/device/msc/Makefile rename to test/fuzz/device/msc/Makefile index 76a43923..ee51936b 100644 --- a/fuzz/device/msc/Makefile +++ b/test/fuzz/device/msc/Makefile @@ -1,4 +1,4 @@ -include ../../../tools/top.mk +include ../../../../tools/top.mk include ../../make.mk INC += \ diff --git a/fuzz/device/msc/src/fuzz.cc b/test/fuzz/device/msc/src/fuzz.cc similarity index 100% rename from fuzz/device/msc/src/fuzz.cc rename to test/fuzz/device/msc/src/fuzz.cc diff --git a/fuzz/device/msc/src/tusb_config.h b/test/fuzz/device/msc/src/tusb_config.h similarity index 100% rename from fuzz/device/msc/src/tusb_config.h rename to test/fuzz/device/msc/src/tusb_config.h diff --git a/fuzz/device/msc/src/usb_descriptors.cc b/test/fuzz/device/msc/src/usb_descriptors.cc similarity index 100% rename from fuzz/device/msc/src/usb_descriptors.cc rename to test/fuzz/device/msc/src/usb_descriptors.cc diff --git a/fuzz/device/net/CMakeLists.txt b/test/fuzz/device/net/CMakeLists.txt similarity index 100% rename from fuzz/device/net/CMakeLists.txt rename to test/fuzz/device/net/CMakeLists.txt diff --git a/fuzz/device/net/Makefile b/test/fuzz/device/net/Makefile similarity index 98% rename from fuzz/device/net/Makefile rename to test/fuzz/device/net/Makefile index 42601e73..22241fcd 100644 --- a/fuzz/device/net/Makefile +++ b/test/fuzz/device/net/Makefile @@ -1,6 +1,6 @@ DEPS_SUBMODULES += lib/lwip -include ../../../tools/top.mk +include ../../../../tools/top.mk include ../../make.mk # suppress warning caused by lwip diff --git a/fuzz/device/net/src/arch/cc.h b/test/fuzz/device/net/src/arch/cc.h similarity index 100% rename from fuzz/device/net/src/arch/cc.h rename to test/fuzz/device/net/src/arch/cc.h diff --git a/fuzz/device/net/src/fuzz.cc b/test/fuzz/device/net/src/fuzz.cc similarity index 100% rename from fuzz/device/net/src/fuzz.cc rename to test/fuzz/device/net/src/fuzz.cc diff --git a/fuzz/device/net/src/lwipopts.h b/test/fuzz/device/net/src/lwipopts.h similarity index 100% rename from fuzz/device/net/src/lwipopts.h rename to test/fuzz/device/net/src/lwipopts.h diff --git a/fuzz/device/net/src/tusb_config.h b/test/fuzz/device/net/src/tusb_config.h similarity index 100% rename from fuzz/device/net/src/tusb_config.h rename to test/fuzz/device/net/src/tusb_config.h diff --git a/fuzz/device/net/src/usb_descriptors.cc b/test/fuzz/device/net/src/usb_descriptors.cc similarity index 100% rename from fuzz/device/net/src/usb_descriptors.cc rename to test/fuzz/device/net/src/usb_descriptors.cc diff --git a/fuzz/dicts/cdc.dict b/test/fuzz/dicts/cdc.dict similarity index 100% rename from fuzz/dicts/cdc.dict rename to test/fuzz/dicts/cdc.dict diff --git a/fuzz/fuzz.cc b/test/fuzz/fuzz.cc similarity index 100% rename from fuzz/fuzz.cc rename to test/fuzz/fuzz.cc diff --git a/fuzz/fuzz.h b/test/fuzz/fuzz.h similarity index 100% rename from fuzz/fuzz.h rename to test/fuzz/fuzz.h diff --git a/fuzz/fuzz_private.h b/test/fuzz/fuzz_private.h similarity index 100% rename from fuzz/fuzz_private.h rename to test/fuzz/fuzz_private.h diff --git a/fuzz/make.mk b/test/fuzz/make.mk similarity index 98% rename from fuzz/make.mk rename to test/fuzz/make.mk index 796ddc44..3da79e8f 100644 --- a/fuzz/make.mk +++ b/test/fuzz/make.mk @@ -37,7 +37,7 @@ endif #-------------- Source files and compiler flags -------------- -INC += $(TOP)/$(FAMILY_PATH) +INC += $(TOP)/test # Compiler Flags CFLAGS += \ diff --git a/fuzz/msc_fuzz.cc b/test/fuzz/msc_fuzz.cc similarity index 100% rename from fuzz/msc_fuzz.cc rename to test/fuzz/msc_fuzz.cc diff --git a/fuzz/net_fuzz.cc b/test/fuzz/net_fuzz.cc similarity index 100% rename from fuzz/net_fuzz.cc rename to test/fuzz/net_fuzz.cc diff --git a/fuzz/rules.mk b/test/fuzz/rules.mk similarity index 96% rename from fuzz/rules.mk rename to test/fuzz/rules.mk index 1d65adbb..d9c2a1a7 100644 --- a/fuzz/rules.mk +++ b/test/fuzz/rules.mk @@ -40,11 +40,11 @@ SRC_C += \ # Fuzzers are c++ SRC_CXX += \ - fuzz/dcd_fuzz.cc \ - fuzz/fuzz.cc \ - fuzz/msc_fuzz.cc \ - fuzz/net_fuzz.cc \ - fuzz/usbd_fuzz.cc + test/fuzz/dcd_fuzz.cc \ + test/fuzz/fuzz.cc \ + test/fuzz/msc_fuzz.cc \ + test/fuzz/net_fuzz.cc \ + test/fuzz/usbd_fuzz.cc # TinyUSB stack include INC += $(TOP)/src diff --git a/fuzz/usbd_fuzz.cc b/test/fuzz/usbd_fuzz.cc similarity index 100% rename from fuzz/usbd_fuzz.cc rename to test/fuzz/usbd_fuzz.cc