Rename the test program directory to testprogs.

We may have a directory of test files in the future, and we'd want to
call it "tests", paralleling tcpdump's directory of test files.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d70aab95c876c4ec8731da38c9a7331f5d2039a9..e9c4a8969421137f903413b6ff7116d42bc011f0 100644 (file)
--- 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 a49e29a6f6866339bdbf5513e1b9411ed4a75306..e1c2c918a7c87d4ad9d5710a24f9e653db56b199 100644 (file)
--- 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 fc5f4d5d851b651896f9ed513c61299a8da4053d..c210931188be87ce003d20a6bc0cd1a382e4a7e4 100755 (executable)
--- 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 3ec99aacc0b7bec8667a78d9fcf1cb8e25c02f21..9ecadc47f726c882a86d1e85399e757f892de8d9 100644 (file)
--- 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
similarity index 100%
rename from tests/.gitignore
rename to testprogs/.gitignore

diff --git a/tests/BPF/1.txt b/testprogs/BPF/1.txt
similarity index 100%
rename from tests/BPF/1.txt
rename to testprogs/BPF/1.txt

diff --git a/tests/BPF/2.txt b/testprogs/BPF/2.txt
similarity index 100%
rename from tests/BPF/2.txt
rename to testprogs/BPF/2.txt

diff --git a/tests/BPF/3.txt b/testprogs/BPF/3.txt
similarity index 100%
rename from tests/BPF/3.txt
rename to testprogs/BPF/3.txt

diff --git a/tests/BPF/4.txt b/testprogs/BPF/4.txt
similarity index 100%
rename from tests/BPF/4.txt
rename to testprogs/BPF/4.txt

diff --git a/tests/BPF/5.txt b/testprogs/BPF/5.txt
similarity index 100%
rename from tests/BPF/5.txt
rename to testprogs/BPF/5.txt

diff --git a/tests/BPF/6.txt b/testprogs/BPF/6.txt
similarity index 100%
rename from tests/BPF/6.txt
rename to testprogs/BPF/6.txt

diff --git a/tests/BPF/7.txt b/testprogs/BPF/7.txt
similarity index 100%
rename from tests/BPF/7.txt
rename to testprogs/BPF/7.txt

diff --git a/tests/CMakeLists.txt b/testprogs/CMakeLists.txt
similarity index 93%
rename from tests/CMakeLists.txt
rename to testprogs/CMakeLists.txt
index 63781221f069eb7d6c2f09eb064da5b3b62170e7..fda14dc7fc1a90ec00bfc5fcc8d1f9409cbad83e 100644 (file)
--- 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
similarity index 100%
rename from tests/Makefile.in
rename to testprogs/Makefile.in

diff --git a/tests/can_set_rfmon_test.c b/testprogs/can_set_rfmon_test.c
similarity index 100%
rename from tests/can_set_rfmon_test.c
rename to testprogs/can_set_rfmon_test.c

diff --git a/tests/capturetest.c b/testprogs/capturetest.c
similarity index 100%
rename from tests/capturetest.c
rename to testprogs/capturetest.c

diff --git a/tests/filtertest.c b/testprogs/filtertest.c
similarity index 100%
rename from tests/filtertest.c
rename to testprogs/filtertest.c

diff --git a/tests/findalldevstest.c b/testprogs/findalldevstest.c
similarity index 100%
rename from tests/findalldevstest.c
rename to testprogs/findalldevstest.c

diff --git a/tests/opentest.c b/testprogs/opentest.c
similarity index 100%
rename from tests/opentest.c
rename to testprogs/opentest.c

diff --git a/tests/pcap_compile_test.c b/testprogs/pcap_compile_test.c
similarity index 100%
rename from tests/pcap_compile_test.c
rename to testprogs/pcap_compile_test.c

diff --git a/tests/reactivatetest.c b/testprogs/reactivatetest.c
similarity index 100%
rename from tests/reactivatetest.c
rename to testprogs/reactivatetest.c

diff --git a/tests/selpolltest.c b/testprogs/selpolltest.c
similarity index 100%
rename from tests/selpolltest.c
rename to testprogs/selpolltest.c

diff --git a/tests/threadsignaltest.c b/testprogs/threadsignaltest.c
similarity index 100%
rename from tests/threadsignaltest.c
rename to testprogs/threadsignaltest.c

diff --git a/tests/unix.h b/testprogs/unix.h
similarity index 100%
rename from tests/unix.h
rename to testprogs/unix.h

diff --git a/tests/valgrindtest.c b/testprogs/valgrindtest.c
similarity index 100%
rename from tests/valgrindtest.c
rename to testprogs/valgrindtest.c

diff --git a/tests/visopts.py b/testprogs/visopts.py
similarity index 100%
rename from tests/visopts.py
rename to testprogs/visopts.py