[hydra-commits] kpfleming: ice/trunk r600 - in /ice/trunk: Makefile.mak scripts/TestUtil.py

[SVN commits to the Hydra project]

Author: kpfleming
Date: Mon Apr 26 17:01:53 2010
New Revision: 600

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=600
Log:
bring in some changes from slice-preserving-translators that really belong here

Modified:
    ice/trunk/Makefile.mak   (contents, props changed)
    ice/trunk/scripts/TestUtil.py   (contents, props changed)

Modified: ice/trunk/Makefile.mak
URL: https://origsvn.digium.com/svn-view/hydra/ice/trunk/Makefile.mak?view=diff&rev=600&r1=599&r2=600
==============================================================================
--- ice/trunk/Makefile.mak (original)
+++ ice/trunk/Makefile.mak Mon Apr 26 17:01:53 2010
@@ -47,6 +47,11 @@
 	    @echo "making install in %i" && \
 	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) install" || exit 1
 
+test::
+	@for %i in ( $(SUBDIRS) ) do \
+	    @echo "making test in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) test" || exit 1
+
 cpp::
 	@echo "making all in cpp" && \
 	cmd /c "cd cpp && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1

Propchange: ice/trunk/Makefile.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 26 17:01:53 2010
@@ -1,0 +1,4 @@
+/ice/branches/icebox-local/Makefile.mak:149-423
+/ice/branches/skipped-slice-recovery/Makefile.mak:565-582
+/ice/branches/slice-preserving-translators/Makefile.mak:583-599
+/ice/upstream/3.4.0/Makefile.mak:509-510

Modified: ice/trunk/scripts/TestUtil.py
URL: https://origsvn.digium.com/svn-view/hydra/ice/trunk/scripts/TestUtil.py?view=diff&rev=600&r1=599&r2=600
==============================================================================
--- ice/trunk/scripts/TestUtil.py (original)
+++ ice/trunk/scripts/TestUtil.py Mon Apr 26 17:01:53 2010
@@ -1189,7 +1189,7 @@
         os.remove(os.path.join(path, "__Freeze", "lock"))
     if os.path.exists(os.path.join(path, "__Freeze")):
         os.rmdir(os.path.join(path, "__Freeze"))
-    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore" and f != "DB_CONFIG" ]:
+    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore"  and f != ".svn" and f != "DB_CONFIG" ]:
         os.remove(filename)
 
 def startClient(exe, args = "", config=None, env=None, echo = True, startReader = True):

Propchange: ice/trunk/scripts/TestUtil.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 26 17:01:53 2010
@@ -1,0 +1,4 @@
+/ice/branches/icebox-local/scripts/TestUtil.py:149-423
+/ice/branches/skipped-slice-recovery/scripts/TestUtil.py:565-582
+/ice/branches/slice-preserving-translators/scripts/TestUtil.py:583-599
+/ice/upstream/3.4.0/scripts/TestUtil.py:509-510