move fuzz into test/fuzz

30 files changed, 9 insertions, 12 deletions

diff --git a/fuzz/device/cdc/skip.txt b/fuzz/device/cdc/skip.txt
deleted file mode 100644
index d844feae8..000000000
--- 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 d844feae8..000000000
--- 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 d844feae8..000000000
--- 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
index 7153e20f0..7153e20f0 100644
--- a/fuzz/dcd_fuzz.cc
+++ b/test/fuzz/dcd_fuzz.cc
diff --git a/fuzz/device/cdc/CMakeLists.txt b/test/fuzz/device/cdc/CMakeLists.txt
index fa6e83b7e..fa6e83b7e 100644
--- a/fuzz/device/cdc/CMakeLists.txt
+++ b/test/fuzz/device/cdc/CMakeLists.txt
diff --git a/fuzz/device/cdc/Makefile b/test/fuzz/device/cdc/Makefile
index 76a43923f..ee51936b5 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
index d40483ca6..d40483ca6 100644
--- a/fuzz/device/cdc/src/fuzz.cc
+++ b/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
index 10a8a825a..10a8a825a 100644
--- a/fuzz/device/cdc/src/tusb_config.h
+++ b/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
index 0f636f05d..0f636f05d 100644
--- a/fuzz/device/cdc/src/usb_descriptors.cc
+++ b/test/fuzz/device/cdc/src/usb_descriptors.cc
diff --git a/fuzz/device/msc/CMakeLists.txt b/test/fuzz/device/msc/CMakeLists.txt
index fa6e83b7e..fa6e83b7e 100644
--- a/fuzz/device/msc/CMakeLists.txt
+++ b/test/fuzz/device/msc/CMakeLists.txt
diff --git a/fuzz/device/msc/Makefile b/test/fuzz/device/msc/Makefile
index 76a43923f..ee51936b5 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
index 568900452..568900452 100644
--- a/fuzz/device/msc/src/fuzz.cc
+++ b/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
index ca39c6b0a..ca39c6b0a 100644
--- a/fuzz/device/msc/src/tusb_config.h
+++ b/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
index ded401fc9..ded401fc9 100644
--- a/fuzz/device/msc/src/usb_descriptors.cc
+++ b/test/fuzz/device/msc/src/usb_descriptors.cc
diff --git a/fuzz/device/net/CMakeLists.txt b/test/fuzz/device/net/CMakeLists.txt
index fa6e83b7e..fa6e83b7e 100644
--- a/fuzz/device/net/CMakeLists.txt
+++ b/test/fuzz/device/net/CMakeLists.txt
diff --git a/fuzz/device/net/Makefile b/test/fuzz/device/net/Makefile
index 42601e73e..22241fcdc 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
index 56a0cacf7..56a0cacf7 100644
--- a/fuzz/device/net/src/arch/cc.h
+++ b/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
index ea4943665..ea4943665 100644
--- a/fuzz/device/net/src/fuzz.cc
+++ b/test/fuzz/device/net/src/fuzz.cc
diff --git a/fuzz/device/net/src/lwipopts.h b/test/fuzz/device/net/src/lwipopts.h
index a215017c7..a215017c7 100644
--- a/fuzz/device/net/src/lwipopts.h
+++ b/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
index 6ad859337..6ad859337 100644
--- a/fuzz/device/net/src/tusb_config.h
+++ b/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
index c600bd801..c600bd801 100644
--- a/fuzz/device/net/src/usb_descriptors.cc
+++ b/test/fuzz/device/net/src/usb_descriptors.cc
diff --git a/fuzz/dicts/cdc.dict b/test/fuzz/dicts/cdc.dict
index 138775cdc..138775cdc 100644
--- a/fuzz/dicts/cdc.dict
+++ b/test/fuzz/dicts/cdc.dict
diff --git a/fuzz/fuzz.cc b/test/fuzz/fuzz.cc
index 2e4186f1a..2e4186f1a 100644
--- a/fuzz/fuzz.cc
+++ b/test/fuzz/fuzz.cc
diff --git a/fuzz/fuzz.h b/test/fuzz/fuzz.h
index 6aa4949a1..6aa4949a1 100644
--- a/fuzz/fuzz.h
+++ b/test/fuzz/fuzz.h
diff --git a/fuzz/fuzz_private.h b/test/fuzz/fuzz_private.h
index 0d791fcdc..0d791fcdc 100644
--- a/fuzz/fuzz_private.h
+++ b/test/fuzz/fuzz_private.h
diff --git a/fuzz/make.mk b/test/fuzz/make.mk
index 796ddc443..3da79e8ff 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
index e906ca971..e906ca971 100644
--- a/fuzz/msc_fuzz.cc
+++ b/test/fuzz/msc_fuzz.cc
diff --git a/fuzz/net_fuzz.cc b/test/fuzz/net_fuzz.cc
index 8467d6d8e..8467d6d8e 100644
--- a/fuzz/net_fuzz.cc
+++ b/test/fuzz/net_fuzz.cc
diff --git a/fuzz/rules.mk b/test/fuzz/rules.mk
index 1d65adbb7..d9c2a1a77 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
index 45c5fd7ea..45c5fd7ea 100644
--- a/fuzz/usbd_fuzz.cc
+++ b/test/fuzz/usbd_fuzz.cc