Changeset: 97f742bd9f54 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97f742bd9f54
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (47 lines):
diff -r 9b8e4e2fe381 -r 97f742bd9f54 MonetDB/src/gdk/gdk_utils.mx
--- a/MonetDB/src/gdk/gdk_utils.mx Mon Nov 01 09:37:16 2010 +0100
+++ b/MonetDB/src/gdk/gdk_utils.mx Mon Nov 01 14:50:37 2010 +0100
@@ -1726,7 +1726,10 @@
}
}
(void) GDKgetHome();
+#if 0
+ /* we can't clean up after killing threads */
BBPexit();
+#endif
GDKlog(GDKLOGOFF);
GDKunlockHome();
MT_global_exit(status);
diff -r 9b8e4e2fe381 -r 97f742bd9f54 buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst Mon Nov 01 09:37:16 2010 +0100
+++ b/buildtools/doc/windowsbuild.rst Mon Nov 01 14:50:37 2010 +0100
@@ -273,20 +273,6 @@
at http://gnuwin32.sourceforge.net/. Click on the Packages link on
the left and then on Patch, and get the Setup file and install it.
-PsKill
-------
-
-PsKill is a program to kill (terminate) processes. This program is
-only used during testing to terminate tests that take too long.
-
-PsKill is part of the `Windows Sysinternals`__. Go to the Process
-Utilities, and get the PsKill package. PsKill is also part of the
-PsTools package and the Sysinternals Suite, so you can get those
-instead. Extract the archive, and make sure that the folder is in
-your ``Path`` variable when you run the tests.
-
-__ http://www.microsoft.com/technet/sysinternals/default.mspx
-
PCRE (Perl Compatible Regular Expressions)
------------------------------------------
@@ -748,8 +734,6 @@
set Path=C:\Python25;C:\Python25\Scripts;%Path%
rem Bison and Flex (and Diff)
set Path=%ProgramFiles%\GnuWin32\bin;%Path%
- rem for testing: pskill
- set Path=%ProgramFiles%\PsTools;%Path%
rem Java is optional, set JAVA_HOME for convenience
set JAVA_HOME=%ProgramFiles%\Java\jdk1.5.0_13
set Path=%JAVA_HOME%\bin;%ProgramFiles%\Java\jre1.5.0_13\bin;%Path%
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
