Remove dependency of src/debug.cc

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index f0d8bfc6f2b78b8133575297274f35af514495e4..11f9cddb9db4dde85dd5b78f6e721df3db2b8c89 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.10 2003/07/08 22:50:15 hno Exp $
+#  $Id: Makefile.am,v 1.11 2003/07/08 23:10:59 hno Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -35,27 +35,27 @@ check_PROGRAMS= debug \
 
 LDADD = -L$(top_builddir)/lib -lmiscutil
 debug_SOURCES = debug.cc test_tools.cc
-debug_LDADD = $(top_builddir)/lib/Array.o $(LDADD)
+debug_LDADD = $(top_builddir)/lib/Array.o \
+               $(top_builddir)/src/globals.o \
+               $(LDADD)
 mem_node_test_SOURCES = mem_node_test.cc
 mem_node_test_LDADD = $(top_builddir)/src/mem_node.o $(LDADD)
 mem_hdr_test_SOURCES = mem_hdr_test.cc test_tools.cc
 mem_hdr_test_LDADD = $(top_builddir)/src/stmem.o \
+                    $(top_builddir)/src/globals.o \
                     $(top_builddir)/src/mem_node.o $(LDADD)
 MemPoolTest_SOURCES = MemPoolTest.cc
 refcount_SOURCES = refcount.cc
 
-DEBUG_OBJECTS = $(top_builddir)/src/debug.o\
-               $(top_builddir)/src/tools.o\
-               $(top_builddir)/src/globals.o
-
-http_range_test_SOURCES = http_range_test.cc
+http_range_test_SOURCES = http_range_test.cc test_tools.cc
 http_range_test_LDADD = $(top_builddir)/src/HttpHdrRange.o \
                $(top_builddir)/src/HttpHeaderTools.o \
                $(top_builddir)/src/MemBuf.o \
                $(top_builddir)/src/Packer.o \
                $(top_builddir)/src/String.o \
                $(top_builddir)/src/mem.o \
-               $(DEBUG_OBJECTS) $(LDADD)
+               $(top_builddir)/src/globals.o \
+               $(LDADD)
 
 splay_SOURCES = splay.cc
 

diff --git a/test-suite/http_range_test.cc b/test-suite/http_range_test.cc
index e396e14fb082396a24af328bc4a8a0a8f7653791..c592655c19eead427e84011ef7b90f38a487a789 100644 (file)
--- a/test-suite/http_range_test.cc
+++ b/test-suite/http_range_test.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http_range_test.cc,v 1.6 2003/05/21 02:58:10 robertc Exp $
+ * $Id: http_range_test.cc,v 1.7 2003/07/08 23:10:59 hno Exp $
  *
  * DEBUG: section 64    HTTP Range Header
  * AUTHOR: Alex Rousskov
@@ -112,12 +112,6 @@ ACLChecklist::operator delete (void *address)
 
 ACLChecklist::~ACLChecklist(){}
 
-SQUIDCEXTERN void fatal (char const *msg)
-{
-    printf ("%s\n",msg);
-    exit (1);
-}
-
 SQUIDCEXTERN ACLChecklist *aclChecklistCreate(const acl_access *,
         request_t *,
         const char *ident)

diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc
index ce1ff9b0a4fef22edd77f32cf19557f026061efc..576fa69f47a598778127d6933e712138c124f5ca 100644 (file)
--- a/test-suite/test_tools.cc
+++ b/test-suite/test_tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: test_tools.cc,v 1.3 2003/07/08 23:01:47 robertc Exp $
+ * $Id: test_tools.cc,v 1.4 2003/07/08 23:10:59 hno Exp $
  *
  * AUTHOR: Robert Collins
  *
@@ -44,7 +44,6 @@ xassert(const char *msg, const char *file, int line)
     std::cout << "Assertion failed: (" << msg << ") at " << file << ":" << line << std::endl;
     exit (1);
 }
-time_t squid_curtime = 0;
 
 int Debug::Levels[MAX_DEBUG_SECTIONS];
 int Debug::level;