From owner-p4-projects@FreeBSD.ORG  Mon Aug 10 03:37:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DE5F1065673; Mon, 10 Aug 2009 03:37:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D791D106566B
	for <perforce@FreeBSD.org>; Mon, 10 Aug 2009 03:37:54 +0000 (UTC)
	(envelope-from zjriggl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C6D268FC22
	for <perforce@FreeBSD.org>; Mon, 10 Aug 2009 03:37:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7A3bsPQ050194
	for <perforce@FreeBSD.org>; Mon, 10 Aug 2009 03:37:54 GMT
	(envelope-from zjriggl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7A3bsgZ050192
	for perforce@freebsd.org; Mon, 10 Aug 2009 03:37:54 GMT
	(envelope-from zjriggl@FreeBSD.org)
Date: Mon, 10 Aug 2009 03:37:54 GMT
Message-Id: <200908100337.n7A3bsgZ050192@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zjriggl@FreeBSD.org using -f
From: Zachariah Riggle <zjriggl@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167159 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Aug 2009 03:37:55 -0000

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

Change 167159 by zjriggl@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'