26 files changed, 23 insertions, 23 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d70aab95..e9c4a896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1774,7 +1774,7 @@ if(WIN32)
     set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} ${pcap_SOURCE_DIR}/pcap-dll.rc)
 endif(WIN32)
 
-add_subdirectory(tests)
+add_subdirectory(testprogs)
 
 ######################################
 # Register targets
diff --git a/Makefile.in b/Makefile.in
index a49e29a6..e1c2c918 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -363,18 +363,18 @@ EXTRA_DIST = \
 	sockutils.c \
 	sockutils.h \
 	scanner.l \
-	tests/CMakeLists.txt \
-	tests/Makefile.in \
-	tests/can_set_rfmon_test.c \
-	tests/capturetest.c \
-	tests/filtertest.c \
-	tests/findalldevstest.c \
-	tests/opentest.c \
-	tests/reactivatetest.c \
-	tests/selpolltest.c \
-	tests/threadsignaltest.c \
-	tests/unix.h \
-	tests/valgrindtest.c \
+	testprogs/CMakeLists.txt \
+	testprogs/Makefile.in \
+	testprogs/can_set_rfmon_test.c \
+	testprogs/capturetest.c \
+	testprogs/filtertest.c \
+	testprogs/findalldevstest.c \
+	testprogs/opentest.c \
+	testprogs/reactivatetest.c \
+	testprogs/selpolltest.c \
+	testprogs/threadsignaltest.c \
+	testprogs/unix.h \
+	testprogs/valgrindtest.c \
 	Win32/Prj/wpcap.sln \
 	Win32/Prj/wpcap.vcxproj \
 	Win32/Prj/wpcap.vcxproj.filters
@@ -531,8 +531,8 @@ build-rpcapd: libpcap.a
 #
 # Test programs - not built by default, and not installed.
 #
-tests: FORCE
-	cd tests; $(MAKE)
+testprogs: FORCE
+	cd testprogs; $(MAKE)
 
 FORCE:
 
@@ -718,7 +718,7 @@ uninstall-rpcapd:
 clean:
 	rm -f $(CLEANFILES)
 	cd rpcapd; $(MAKE) clean
-	cd tests; $(MAKE) clean
+	cd testprogs; $(MAKE) clean
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
@@ -727,7 +727,7 @@ distclean: clean
 	rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
 	rm -rf autom4te.cache
 	cd rpcapd; $(MAKE) distclean
-	cd tests; $(MAKE) distclean
+	cd testprogs; $(MAKE) distclean
 
 extags: $(TAGFILES)
 	ctags $(TAGFILES)
@@ -747,4 +747,4 @@ releasetar:
 depend:	$(GENSRC) $(GENHDR) bpf_filter.c
 	$(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" $(CFLAGS) $(DEFS) $(INCLS) $(SRC)
 	cd rpcapd; $(MAKE) depend
-	cd tests; $(MAKE) depend
+	cd testprogs; $(MAKE) depend
diff --git a/configure b/configure
index fc5f4d5d..c2109311 100755
--- a/configure
+++ b/configure
@@ -9741,7 +9741,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 ac_config_commands="$ac_config_commands default-1"
 
-ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcapd/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcapd/Makefile testprogs/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10461,7 +10461,7 @@ do
     "pcap_set_tstamp_precision.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_precision.3pcap" ;;
     "pcap_set_tstamp_type.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_type.3pcap" ;;
     "rpcapd/Makefile") CONFIG_FILES="$CONFIG_FILES rpcapd/Makefile" ;;
-    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "testprogs/Makefile") CONFIG_FILES="$CONFIG_FILES testprogs/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index 3ec99aac..9ecadc47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2274,5 +2274,5 @@ AC_OUTPUT(Makefile pcap-filter.manmisc pcap-linktype.manmisc
 	pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap
 	pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap
 	pcap_open_offline.3pcap pcap_set_tstamp_precision.3pcap
-	pcap_set_tstamp_type.3pcap rpcapd/Makefile tests/Makefile)
+	pcap_set_tstamp_type.3pcap rpcapd/Makefile testprogs/Makefile)
 exit 0
diff --git a/tests/.gitignore b/testprogs/.gitignore
index b9178b4e..b9178b4e 100644
--- a/tests/.gitignore
+++ b/testprogs/.gitignore
diff --git a/tests/BPF/1.txt b/testprogs/BPF/1.txt
index 66086952..66086952 100644
--- a/tests/BPF/1.txt
+++ b/testprogs/BPF/1.txt
diff --git a/tests/BPF/2.txt b/testprogs/BPF/2.txt
index e9bc1165..e9bc1165 100644
--- a/tests/BPF/2.txt
+++ b/testprogs/BPF/2.txt
diff --git a/tests/BPF/3.txt b/testprogs/BPF/3.txt
index 6c08d3d0..6c08d3d0 100644
--- a/tests/BPF/3.txt
+++ b/testprogs/BPF/3.txt
diff --git a/tests/BPF/4.txt b/testprogs/BPF/4.txt
index 3fd2e663..3fd2e663 100644
--- a/tests/BPF/4.txt
+++ b/testprogs/BPF/4.txt
diff --git a/tests/BPF/5.txt b/testprogs/BPF/5.txt
index 23fc0ca5..23fc0ca5 100644
--- a/tests/BPF/5.txt
+++ b/testprogs/BPF/5.txt
diff --git a/tests/BPF/6.txt b/testprogs/BPF/6.txt
index 694c185b..694c185b 100644
--- a/tests/BPF/6.txt
+++ b/testprogs/BPF/6.txt
diff --git a/tests/BPF/7.txt b/testprogs/BPF/7.txt
index 33978a4e..33978a4e 100644
--- a/tests/BPF/7.txt
+++ b/testprogs/BPF/7.txt
diff --git a/tests/CMakeLists.txt b/testprogs/CMakeLists.txt
index 63781221..fda14dc7 100644
--- a/tests/CMakeLists.txt
+++ b/testprogs/CMakeLists.txt
@@ -3,7 +3,7 @@ if(MSVC)
   include_directories(${pcap_SOURCE_DIR}/missing)
 endif(MSVC)
 
-add_custom_target(tests)
+add_custom_target(testprogs)
 
 macro(add_test_executable _executable)
   add_executable(${_executable} EXCLUDE_FROM_ALL
@@ -17,7 +17,7 @@ macro(add_test_executable _executable)
     target_link_libraries(${_executable}
       ${ARGN} ${LIBRARY_NAME}_static ${PCAP_LINK_LIBRARIES})
   endif(WIN32)
-  add_dependencies(tests ${_executable})
+  add_dependencies(testprogs ${_executable})
 endmacro()
 
 add_test_executable(can_set_rfmon_test)
diff --git a/tests/Makefile.in b/testprogs/Makefile.in
index ec0a4720..ec0a4720 100644
--- a/tests/Makefile.in
+++ b/testprogs/Makefile.in
diff --git a/tests/can_set_rfmon_test.c b/testprogs/can_set_rfmon_test.c
index ea4f0c40..ea4f0c40 100644
--- a/tests/can_set_rfmon_test.c
+++ b/testprogs/can_set_rfmon_test.c
diff --git a/tests/capturetest.c b/testprogs/capturetest.c
index 573239f2..573239f2 100644
--- a/tests/capturetest.c
+++ b/testprogs/capturetest.c
diff --git a/tests/filtertest.c b/testprogs/filtertest.c
index 380cb73e..380cb73e 100644
--- a/tests/filtertest.c
+++ b/testprogs/filtertest.c
diff --git a/tests/findalldevstest.c b/testprogs/findalldevstest.c
index 6a221f25..6a221f25 100644
--- a/tests/findalldevstest.c
+++ b/testprogs/findalldevstest.c
diff --git a/tests/opentest.c b/testprogs/opentest.c
index bad38eb0..bad38eb0 100644
--- a/tests/opentest.c
+++ b/testprogs/opentest.c
diff --git a/tests/pcap_compile_test.c b/testprogs/pcap_compile_test.c
index 924ec732..924ec732 100644
--- a/tests/pcap_compile_test.c
+++ b/testprogs/pcap_compile_test.c
diff --git a/tests/reactivatetest.c b/testprogs/reactivatetest.c
index 42b2c3b8..42b2c3b8 100644
--- a/tests/reactivatetest.c
+++ b/testprogs/reactivatetest.c
diff --git a/tests/selpolltest.c b/testprogs/selpolltest.c
index 5d47b3d5..5d47b3d5 100644
--- a/tests/selpolltest.c
+++ b/testprogs/selpolltest.c
diff --git a/tests/threadsignaltest.c b/testprogs/threadsignaltest.c
index bd46f936..bd46f936 100644
--- a/tests/threadsignaltest.c
+++ b/testprogs/threadsignaltest.c
diff --git a/tests/unix.h b/testprogs/unix.h
index 68ef4cb9..68ef4cb9 100644
--- a/tests/unix.h
+++ b/testprogs/unix.h
diff --git a/tests/valgrindtest.c b/testprogs/valgrindtest.c
index c2e3d790..c2e3d790 100644
--- a/tests/valgrindtest.c
+++ b/testprogs/valgrindtest.c
diff --git a/tests/visopts.py b/testprogs/visopts.py
index ab4f396d..ab4f396d 100755
--- a/tests/visopts.py
+++ b/testprogs/visopts.py