move logger_test to bin/misc/

diff --git a/bin/misc/.gitignore b/bin/misc/.gitignore
index 15f4cd1a3254accb1b4e6365a1ff16f311e6e708..2bff10ed3a1d944593ad9ff8cea65d8cbecbe84d 100644 (file)
--- a/bin/misc/.gitignore
+++ b/bin/misc/.gitignore
@@ -1,9 +1,10 @@
 Makefile
 Makefile.in
 netacnv
+afpldaptest
+logger_test
 .deps
 .libs
 *.o
-afpldaptest
-.gitignore
-netacnv.o
+
+

diff --git a/bin/misc/Makefile.am b/bin/misc/Makefile.am
index e12e782d737d4aae51e2fa6b92e60bf5775725bc..93a0c256be6b45777c23d6dbea0eb655164bcb65 100644 (file)
--- a/bin/misc/Makefile.am
+++ b/bin/misc/Makefile.am
@@ -3,10 +3,14 @@
 pkgconfdir = @PKGCONFDIR@
 bin_PROGRAMS =
 
-noinst_PROGRAMS = netacnv
+noinst_PROGRAMS = netacnv logger_test
+
 netacnv_SOURCES = netacnv.c
 netacnv_LDADD = $(top_builddir)/libatalk/libatalk.la
 
+logger_test_SOURCES = logger_test.c
+logger_test_LDADD = $(top_builddir)/libatalk/libatalk.la
+
 if HAVE_ACLS
 bin_PROGRAMS += afpldaptest
 afpldaptest_SOURCES = uuidtest.c

diff --git a/bin/misc/logger_test.c b/bin/misc/logger_test.c
new file mode 100644 (file)
index 0000000..a968cce
--- /dev/null
+++ b/bin/misc/logger_test.c
@@ -0,0 +1,94 @@
+#include <stdio.h>
+
+#include <atalk/boolean.h>
+#include <atalk/logger.h>
+
+int main(int argc, char *argv[])
+{
+  set_processname("logger_Test");
+#if 0
+  LOG(log_severe, logtype_logger, "Logging Test starting: this should only log to syslog");
+
+  /* syslog testing */
+  LOG(log_severe, logtype_logger, "Disabling syslog logging.");
+  unsetuplog("Default");
+  LOG(log_error, logtype_default, "This shouldn't log to syslog: LOG(log_error, logtype_default).");
+  LOG(log_error, logtype_logger, "This shouldn't log to syslog: LOG(log_error, logtype_logger).");
+  setuplog("Default LOG_INFO");
+  LOG(log_info, logtype_logger, "Set syslog logging to 'log_info', so this should log again. LOG(log_info, logtype_logger).");
+  LOG(log_error, logtype_logger, "This should log to syslog: LOG(log_error, logtype_logger).");
+  LOG(log_error, logtype_default, "This should log to syslog. LOG(log_error, logtype_default).");
+  LOG(log_debug, logtype_logger, "This shouldn't log to syslog. LOG(log_debug, logtype_logger).");
+  LOG(log_debug, logtype_default, "This shouldn't log to syslog. LOG(log_debug, logtype_default).");
+  LOG(log_severe, logtype_logger, "Disabling syslog logging.");
+  unsetuplog("Default");
+#endif
+  /* filelog testing */
+
+  setuplog("DSI log_maxdebug test.log");
+  LOG(log_info, logtype_dsi, "This should log.");
+  LOG(log_error, logtype_default, "This should not log.");
+
+  setuplog("Default log_debug test.log");
+  LOG(log_debug, logtype_default, "This should log.");
+  LOG(log_maxdebug, logtype_default, "This should not log.");
+
+  LOG(log_maxdebug, logtype_dsi, "This should still log.");
+
+  /* flooding prevention check */
+  LOG(log_debug, logtype_default, "Flooding 3x");
+  for (int i = 0; i < 3; i++) {
+      LOG(log_debug, logtype_default, "Flooding...");
+  }
+  /* wipe the array */
+  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
+
+  LOG(log_debug, logtype_default, "-============");
+  LOG(log_debug, logtype_default, "Flooding 5x");
+  for (int i = 0; i < 5; i++) {
+      LOG(log_debug, logtype_default, "Flooding...");
+  }
+  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
+
+  LOG(log_debug, logtype_default, "o============");
+  LOG(log_debug, logtype_default, "Flooding 2005x");
+  for (int i = 0; i < 2005; i++) {
+      LOG(log_debug, logtype_default, "Flooding...");
+  }
+  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
+
+  LOG(log_debug, logtype_default, "0============");
+  LOG(log_debug, logtype_default, "Flooding 11x1");
+  for (int i = 0; i < 11; i++) {
+      LOG(log_error, logtype_default, "flooding 11x1 1");
+  }
+
+  LOG(log_debug, logtype_default, "1============");
+  LOG(log_debug, logtype_default, "Flooding 11x2");
+  for (int i = 0; i < 11; i++) {
+      LOG(log_error, logtype_default, "flooding 11x2 1");
+      LOG(log_error, logtype_default, "flooding 11x2 2");
+  }
+
+  LOG(log_debug, logtype_default, "2============");
+  LOG(log_debug, logtype_default, "Flooding 11x3");
+  for (int i = 0; i < 11; i++) {
+      LOG(log_error, logtype_default, "flooding 11x3 1");
+      LOG(log_error, logtype_default, "flooding 11x3 2");
+      LOG(log_error, logtype_default, "flooding 11x3 3");
+  }
+
+  LOG(log_debug, logtype_default, "3============");
+  LOG(log_debug, logtype_default, "Flooding 11x4");
+  for (int i = 0; i < 11; i++) {
+      LOG(log_error, logtype_default, "flooding 11x4 1");
+      LOG(log_error, logtype_default, "flooding 11x4 2");
+      LOG(log_error, logtype_default, "flooding 11x4 3");
+      LOG(log_error, logtype_default, "flooding 11x4 4");
+  }
+
+
+  return 0;
+}
+
+

diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index f36fbdc1ede20c8d8b9e4ac3857a7c1241300ee1..b844dc5abbd3b87d1d153a99babeb2438e7cf756 100644 (file)
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile.am for libatalk/util/
 
-SUBDIRS = . test
-
 noinst_LTLIBRARIES = libutil.la
 
 AM_CFLAGS = -I$(top_srcdir)/sys

diff --git a/libatalk/util/test/.gitignore b/libatalk/util/test/.gitignore
deleted file mode 100644 (file)
index 3dd6d8e..0000000
--- a/libatalk/util/test/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-logger_test
-test.log
-.deps
-.libs
-
-.gitignore
-logger_test.o

diff --git a/libatalk/util/test/Makefile.am b/libatalk/util/test/Makefile.am
deleted file mode 100644 (file)
index 569936b..0000000
--- a/libatalk/util/test/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-bin_PROGRAMS = logger_test
-
-logger_test_SOURCES = logger_test.c
-logger_test_LDADD =  $(top_builddir)/libatalk/util/libutil.la

diff --git a/libatalk/util/test/logger_test.c b/libatalk/util/test/logger_test.c
deleted file mode 100644 (file)
index a968cce..0000000
--- a/libatalk/util/test/logger_test.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include <stdio.h>
-
-#include <atalk/boolean.h>
-#include <atalk/logger.h>
-
-int main(int argc, char *argv[])
-{
-  set_processname("logger_Test");
-#if 0
-  LOG(log_severe, logtype_logger, "Logging Test starting: this should only log to syslog");
-
-  /* syslog testing */
-  LOG(log_severe, logtype_logger, "Disabling syslog logging.");
-  unsetuplog("Default");
-  LOG(log_error, logtype_default, "This shouldn't log to syslog: LOG(log_error, logtype_default).");
-  LOG(log_error, logtype_logger, "This shouldn't log to syslog: LOG(log_error, logtype_logger).");
-  setuplog("Default LOG_INFO");
-  LOG(log_info, logtype_logger, "Set syslog logging to 'log_info', so this should log again. LOG(log_info, logtype_logger).");
-  LOG(log_error, logtype_logger, "This should log to syslog: LOG(log_error, logtype_logger).");
-  LOG(log_error, logtype_default, "This should log to syslog. LOG(log_error, logtype_default).");
-  LOG(log_debug, logtype_logger, "This shouldn't log to syslog. LOG(log_debug, logtype_logger).");
-  LOG(log_debug, logtype_default, "This shouldn't log to syslog. LOG(log_debug, logtype_default).");
-  LOG(log_severe, logtype_logger, "Disabling syslog logging.");
-  unsetuplog("Default");
-#endif
-  /* filelog testing */
-
-  setuplog("DSI log_maxdebug test.log");
-  LOG(log_info, logtype_dsi, "This should log.");
-  LOG(log_error, logtype_default, "This should not log.");
-
-  setuplog("Default log_debug test.log");
-  LOG(log_debug, logtype_default, "This should log.");
-  LOG(log_maxdebug, logtype_default, "This should not log.");
-
-  LOG(log_maxdebug, logtype_dsi, "This should still log.");
-
-  /* flooding prevention check */
-  LOG(log_debug, logtype_default, "Flooding 3x");
-  for (int i = 0; i < 3; i++) {
-      LOG(log_debug, logtype_default, "Flooding...");
-  }
-  /* wipe the array */
-  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
-
-  LOG(log_debug, logtype_default, "-============");
-  LOG(log_debug, logtype_default, "Flooding 5x");
-  for (int i = 0; i < 5; i++) {
-      LOG(log_debug, logtype_default, "Flooding...");
-  }
-  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
-
-  LOG(log_debug, logtype_default, "o============");
-  LOG(log_debug, logtype_default, "Flooding 2005x");
-  for (int i = 0; i < 2005; i++) {
-      LOG(log_debug, logtype_default, "Flooding...");
-  }
-  LOG(log_debug, logtype_default, "1"); LOG(log_debug, logtype_default, "2"); LOG(log_debug, logtype_default, "3");
-
-  LOG(log_debug, logtype_default, "0============");
-  LOG(log_debug, logtype_default, "Flooding 11x1");
-  for (int i = 0; i < 11; i++) {
-      LOG(log_error, logtype_default, "flooding 11x1 1");
-  }
-
-  LOG(log_debug, logtype_default, "1============");
-  LOG(log_debug, logtype_default, "Flooding 11x2");
-  for (int i = 0; i < 11; i++) {
-      LOG(log_error, logtype_default, "flooding 11x2 1");
-      LOG(log_error, logtype_default, "flooding 11x2 2");
-  }
-
-  LOG(log_debug, logtype_default, "2============");
-  LOG(log_debug, logtype_default, "Flooding 11x3");
-  for (int i = 0; i < 11; i++) {
-      LOG(log_error, logtype_default, "flooding 11x3 1");
-      LOG(log_error, logtype_default, "flooding 11x3 2");
-      LOG(log_error, logtype_default, "flooding 11x3 3");
-  }
-
-  LOG(log_debug, logtype_default, "3============");
-  LOG(log_debug, logtype_default, "Flooding 11x4");
-  for (int i = 0; i < 11; i++) {
-      LOG(log_error, logtype_default, "flooding 11x4 1");
-      LOG(log_error, logtype_default, "flooding 11x4 2");
-      LOG(log_error, logtype_default, "flooding 11x4 3");
-      LOG(log_error, logtype_default, "flooding 11x4 4");
-  }
-
-
-  return 0;
-}
-
-