Menu
▾
▴
|
From: <otm...@us...> - 2008-11-25 14:00:28
|
Revision: 5638
http://jython.svn.sourceforge.net/jython/?rev=5638&view=rev
Author: otmarhumbel
Date: 2008-11-25 14:00:26 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
stronger verification: also import os
Modified Paths:
--------------
trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
Modified: trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java 2008-11-25 04:27:25 UTC (rev 5637)
+++ trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java 2008-11-25 14:00:26 UTC (rev 5638)
@@ -242,6 +242,7 @@
private String getTestScript() {
StringBuilder b = new StringBuilder(80);
b.append("import sys\n");
+ b.append("import os\n");
b.append("print '");
b.append(JYTHON_UP);
b.append("'\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <otm...@us...> - 2008-12-13 14:27:25
|
Revision: 5753
http://jython.svn.sourceforge.net/jython/?rev=5753&view=rev
Author: otmarhumbel
Date: 2008-12-13 14:27:18 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
allow switching to a different java version for verification, e.g:
-A -j /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home
Modified Paths:
--------------
trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
Modified: trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java 2008-12-13 07:33:55 UTC (rev 5752)
+++ trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java 2008-12-13 14:27:18 UTC (rev 5753)
@@ -214,7 +214,7 @@
StringTokenizer tokenizer = new StringTokenizer(error, "\n");
while (tokenizer.hasMoreTokens()) {
String line = tokenizer.nextToken();
- if (line.startsWith("*sys-package-mgr*")) {
+ if (isExpectedError(line)) {
feedback(line);
} else {
throw new DriverException(error);
@@ -222,20 +222,29 @@
}
}
+ private boolean isExpectedError(String line) {
+ boolean expected = false;
+ if (line.startsWith("*sys-package-mgr*")) {
+ expected = true;
+ } else if (line.indexOf("32 bit") >= 0 && line.indexOf("64 bit") >= 0) {
+ // OS X incompatibility message when using -A -j java1.6.0 from java1.5.0
+ expected = true;
+ }
+ return expected;
+ }
+
private void verifyOutput(String output) throws DriverException {
boolean started = false;
StringTokenizer tokenizer = new StringTokenizer(output, "\n");
while (tokenizer.hasMoreTokens()) {
String line = tokenizer.nextToken();
- if (line.startsWith("[ChildProcess]") || line.startsWith(VERIFYING)) {
+ if (isExpectedOutput(line)) {
feedback(line);
- } else {
if (line.startsWith(JYTHON_UP)) {
started = true;
- feedback(line);
- } else {
- throw new DriverException(output);
}
+ } else {
+ throw new DriverException(output);
}
}
if (!started) {
@@ -243,6 +252,16 @@
}
}
+ private boolean isExpectedOutput(String line) {
+ boolean expected = false;
+ if (line.startsWith("[ChildProcess]") || line.startsWith(VERIFYING)) {
+ expected = true;
+ } else if (line.startsWith(JYTHON_UP)) {
+ expected = true;
+ }
+ return expected;
+ }
+
private String getTestScript() {
StringBuilder b = new StringBuilder(80);
b.append("import sys\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2009-06-06 21:42:26
|
Revision: 6463
http://jython.svn.sourceforge.net/jython/?rev=6463&view=rev
Author: pjenvey
Date: 2009-06-06 21:41:26 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
revert the standalone jar workaround for now, we'll revisit this post 2.5
Modified Paths:
--------------
trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
Modified: trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java 2009-06-06 21:40:48 UTC (rev 6462)
+++ trunk/installer/src/java/org/python/util/install/driver/NormalVerifier.java 2009-06-06 21:41:26 UTC (rev 6463)
@@ -23,8 +23,7 @@
private static final String BAT_EXTENSION = ".bat";
- //TODO:Oti re-add an exclamation mark as soon subprocess/jython.bat can handle it
- private static final String JYTHON_UP = "jython up and running";
+ private static final String JYTHON_UP = "jython up and running!";
private static final String JYTHON = "jython";
@@ -270,23 +269,6 @@
b.append("print '");
b.append(JYTHON_UP);
b.append("'\n");
- b.append("# test subprocess if present\n");
- b.append("try:\n");
- b.append(" import subprocess\n");
- b.append(" proceed=True\n");
- b.append("except:\n");
- b.append(" proceed=False\n");
- b.append("if proceed:\n");
- b.append(" print '");
- b.append(VERIFYING);
- b.append(" subprocess");
- b.append("'\n");
- b.append(" exitCode = subprocess.call([sys.executable, '-c', 'print ");
- b.append('"');
- b.append(JYTHON_UP);
- b.append('"');
- b.append("'])\n");
- b.append(" assert exitCode==0\n");
return b.toString();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
