1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Author: Michael R. Crusoe <crusoe@ucdavis.edu>
Description: Disable the version "phone home" for privacy
--- a/Trinity
+++ b/Trinity
@@ -619,7 +619,7 @@ my $VERBOSE = 0;
my $ANANAS_DIR = "";
-my $NO_VERSION_CHECK = 0;
+my $NO_VERSION_CHECK = 1;
my $samples_file = "";
@@ -2904,32 +2904,6 @@ sub test_java_failure_capture {
die "Error, cannot find 'java'. Please be sure it is available within your \${PATH} setting and then try again.";
}
-
- my $cmd = "java -Xmx64m -XX:ParallelGCThreads=$bflyGCThreads $JAVA_OPTS -jar $UTILDIR/support_scripts/ExitTester.jar 0";
- eval {
- &process_cmd($cmd);
- };
- if ($@) {
- print STDERR "Error encountered in testing for running of a simple java application. ";
- print "$@\n\n";
- print STDERR "Please check your java configuration.\n";
- exit(1);
-
- }
-
- $cmd = "java -Xmx4g -XX:ParallelGCThreads=$bflyGCThreads $JAVA_OPTS -jar $UTILDIR/support_scripts/ExitTester.jar 1"; # use 4G to ensure that it's 64-bit java here.
- eval {
- &process_cmd($cmd);
- };
-
- if ($@) {
- print "-we properly captured the java failure status, as needed. Looking good.\n" if $VERBOSE;
- }
- else {
- print STDERR "-we are unable to properly capture java failure status. Please be sure that java (or any wrapper around java that's being used) can properly capture and propagate failure status before proceeding. If your installed java is not 64-bit, note that 64-bit is required.\n";
- exit(1);
- }
-
print "Java tests succeeded.\n" if $VERBOSE;
print "###################################\n\n" if $VERBOSE;
|
