PERFORCE change 167159 for review

[Zachariah Riggle]

http://perforce.freebsd.org/chv.cgi?CH=167159

Change 167159 by zjriggl at zjriggl_tcpregression on 2009/08/10 03:37:36

	Updated makefile, moved 'tests' directory.

Affected files ...

.. //depot/projects/soc2009/zjriggl_tcpregression/Makefile#2 edit
.. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tests/__init__.py#1 add
.. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tests/segmentBufferTest.py#1 add
.. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tests/tcpFilterTest.py#1 add
.. //depot/projects/soc2009/zjriggl_tcpregression/src/tests/segmentBufferTest.py#2 delete
.. //depot/projects/soc2009/zjriggl_tcpregression/src/tests/tcpFilterTest.py#2 edit

Differences ...

==== //depot/projects/soc2009/zjriggl_tcpregression/Makefile#2 (text+ko) ====

@@ -5,14 +5,14 @@
 SO=pcap.so
 
 all: pcap
-	if [ ! -e $(PCAP)/$(SO) ]; then echo "ERROR: cannot find $(PCAP)/$(SO)"; exit 1; fi
-	cp $(PCAP)/$(SO) $(PCS)/$(SO)
+	cp $(PCAP)/build/lib*/pcap.so $(PCS)/pcap.so
+	if [ ! -e $(PCS)/$(SO) ]; then echo "ERROR: cannot find $(PCAP)/$(SO)"; exit 1; else echo "BUILD SUCCESSFUL"; fi
 	
 pcap:
 	echo "Building PCAP for pcs.pcap module"
 	pyrexc $(PCAP)/pcap.pyx
-	$(PYTHON) $(PCAP)/setup.py config $(CONFIG_ARGS)
-	cd $(PCAP); $(PYTHON) setup.py build_ext -i
+	cd $(PCAP); $(PYTHON) setup.py config $(CONFIG_ARGS)
+	cd $(PCAP); $(PYTHON) setup.py build $(CONFIG_ARGS)
 	
 test:
 	$(PYTHON)
@@ -20,4 +20,5 @@
 	
 clean:
 	cd $(PCAP); make clean
-	rm -f $(PCS)/$(SO) $(PCAP)/$(SO)+	rm -f $(PCS)/$(SO) $(PCAP)/$(SO)
+	rm -f `find * | grep "pyc$$"`

==== //depot/projects/soc2009/zjriggl_tcpregression/src/tests/tcpFilterTest.py#2 (text+ko) ====

@@ -10,4 +10,4 @@
 
 from tcpFilter import tcpFilter
 
-
+print 'done'