Changeset 79a7ac1

Timestamp:

03/26/07 16:03:19 (14 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5361eae

Parents:

d644cf0

Message:

• Better make clean
• Deal with testing on macos

File:

• test/Makefile (modified) (5 diffs)

test/Makefile

@@ -24 +24 @@
                 rm -f traces/*.out.*;                           \
                 LD_LIBRARY_PATH="$(libdir)"                     \
+                DYLD_LIBRARY_PATH="$(libdir)"                   \
                  ./$$i || exit $$?;                             \
         done                            
@@ -32 +33 @@
         @echo SLL Decoder 
         @LD_LIBRARY_PATH="$(libdir)" \
+        DYLD_LIBRARY_PATH="$(libdir)" \
         ./test-decode2 pcap:traces/100_sll.pcap
 
         @echo 802.1x decoder
         @LD_LIBRARY_PATH="$(libdir)" \
+        DYLD_LIBRARY_PATH="$(libdir)" \
         ./test-decode2 pcap:traces/8021x.pcap
 
         @echo MPLS Decoder
         @LD_LIBRARY_PATH="$(libdir)" \
+        DYLD_LIBRARY_PATH="$(libdir)" \
         ./test-decode2 pcap:traces/10_mpls_ip.pcap
 
         @echo Radius Decoder
         @LD_LIBRARY_PATH="$(libdir)" \
+        DYLD_LIBRARY_PATH="$(libdir)" \
         ./test-decode2 pcap:traces/radius.pcap
         @for i in erf pcap wtf pcapfile duck legacyatm legacyeth legacypos; do \
@@ -49 +54 @@
                 rm -f traces/*.out.*;                           \
                 LD_LIBRARY_PATH="$(libdir)"                     \
+                DYLD_LIBRARY_PATH="$(libdir)"                   \
                 ./test-format $$i || exit $$?;                  \
                 LD_LIBRARY_PATH="$(libdir)"                     \
+                DYLD_LIBRARY_PATH="$(libdir)"                   \
                 ./test-decode $$i || exit $$?;                  \
         done
@@ -59 +66 @@
                 rm -f traces/*.out.*;                           \
                 LD_LIBRARY_PATH="$(libdir)"                     \
+                DYLD_LIBRARY_PATH="$(libdir)"                   \
                 ./test-write $$i || exit $$?;                   \
         done
@@ -68 +76 @@
         @echo " * erf -> erf"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert erf erf
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert erf erf
         @echo " * erf -> pcap"
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert erf pcap
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert erf pcap
         @echo " * pcap -> erf"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert pcap erf
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert pcap erf
         @echo " * pcapfile -> erf"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert pcapfile erf
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert pcapfile erf
         @echo " * pcapfile -> pcapfile"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert pcapfile pcapfile
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert pcapfile pcapfile
         @echo " * pcap -> pcapfile"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert pcap pcapfile
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert pcap pcapfile
         @echo " * erf -> pcapfile"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert erf pcapfile
-        @#LD_LIBRARY_PATH="$(libdir)" ./test-convert rtclient erf
-        @#LD_LIBRARY_PATH="$(libdir)" ./test-convert rtclient pcap
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert erf pcapfile
+        @#LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert rtclient erf
+        @#LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert rtclient pcap
         @echo " * wtf -> pcap"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert wtf pcap
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert wtf pcap
         #@echo " * wtf -> wtf"
         #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" ./test-convert wtf wtf
+        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert wtf wtf
         #@echo " * legacyatm -> pcapfile"
         #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" ./test-convert legacyatm pcapfile
+        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacyatm pcapfile
         @echo " * legacyeth -> pcapfile"
         @rm -f traces/*.out.*
-        @LD_LIBRARY_PATH="$(libdir)" ./test-convert legacyeth pcapfile
+        @LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacyeth pcapfile
         #@echo " * legacypos -> pcapfile"
         #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" ./test-convert legacypos pcapfile
+        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert legacypos pcapfile
         #@echo " * duck -> duck"
         #@rm -f traces/*.out.*
-        #@LD_LIBRARY_PATH="$(libdir)" ./test-convert duck duck
+        #@LD_LIBRARY_PATH="$(libdir)" DYLD_LIBRARY_PATH="$(libdir)" ./test-convert duck duck
  
 clean:
-        $(RM) $(BINS) $(OBJS) test-format  test-decode test-convert
+        $(RM) $(BINS) $(OBJS) test-format  test-decode test-convert \
+        test-decode2 test-write
 
 distclean: