cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject git commit: Make check for cygwin environment less greedy.
Date Thu, 02 Oct 2014 19:25:52 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 1f10bcbbb -> c4c56fa66


Make check for cygwin environment less greedy.

Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8045


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4c56fa6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4c56fa6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4c56fa6

Branch: refs/heads/cassandra-2.1
Commit: c4c56fa665a5d4d8e1f37a5b263bdc4d0cf0083e
Parents: 1f10bcb
Author: Joshua McKenzie <josh.mckenzie@datastax.com>
Authored: Thu Oct 2 14:23:21 2014 -0500
Committer: Joshua McKenzie <josh.mckenzie@datastax.com>
Committed: Thu Oct 2 14:23:21 2014 -0500

----------------------------------------------------------------------
 bin/cassandra.ps1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4c56fa6/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index ea06f63..33ff97a 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -243,7 +243,10 @@ $env:JAVA_BIN
         try
         {
             $uname = uname -o
-            $cygwin = $true
+            if ($uname.CompareTo("Cygwin") -eq 0)
+            {
+                $cygwin = $true
+            }
         }
         catch
         {
@@ -257,6 +260,7 @@ $env:JAVA_BIN
             # stop-server usage
             if (!$p)
             {
+                echo "Detected cygwin runtime environment.  Adding -Dcassandra-pidfile=$pidfile
to JVM params as control+c trapping on mintty is inconsistent"
                 $arg2 = $arg2 + " -Dcassandra-pidfile=$pidfile"
             }
         }


Mime
View raw message