Update of /cvsroot/fura/FuraSrc/common/SpecificJNI/src
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8372/FuraSrc/common/SpecificJNI/src
Modified Files:
Test.java
Log Message:
cvssync-20080903232636
Index: Test.java
===================================================================
RCS file: /cvsroot/fura/FuraSrc/common/SpecificJNI/src/Test.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Test.java 22 Aug 2008 22:16:23 -0000 1.3
--- Test.java 3 Sep 2008 21:27:23 -0000 1.4
***************
*** 232,245 ****
final int rchildrens3 = rchildrens - 2;
! // Results for AIX_powerpc platform
! final String[] resultsAIXPowerPc = new String[] {
! "0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 + " - "
! + rchildrens + " - true - 0 - true",
! "0 - " + rchildrens + " - 0 - 1 - 0 - false - 0 - true",
! "0 - " + rchildrens + " - 0 - 1 - 0 - false - 0 - true",
! "0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false"
! };
! // Results for SunOS_i386 platform
! final String[] resultsSunosI386 = new String[] {
"0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 + " - "
+ rchildrens + " - true - 0 - true",
--- 232,237 ----
final int rchildrens3 = rchildrens - 2;
! // Results for SunOS_i386 platform, AIX_powerpc, SunOS_sparc
! final String[] resultsUnix = new String[] {
"0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3 + " - "
+ rchildrens + " - true - 0 - true",
***************
*** 248,252 ****
"0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false"
};
! // Results for Darwin_powerpc platform
final String[] resultsMacOsXPowerPc = new String[] {
"0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3
--- 240,244 ----
"0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false"
};
! // Results for Darwin_powerpc platform and resultsMacOsXI386
final String[] resultsMacOsXPowerPc = new String[] {
"0 - " + rchildrens + " - " + rchildrens2 + " - " + rchildrens3
***************
*** 258,264 ****
"0 - " + rchildrens + " - 0 - 0 - 0 - false - 0 - false"
};
- final String[] resultsMacOsXI386 = resultsMacOsXPowerPc;
- // Results for SunOS_sparc platform
- final String[] resultsSunosSparc = resultsSunosI386;
// Results for Windows_NT+x86 platform
final String[] resultsWin32 = new String[] {
--- 250,253 ----
***************
*** 275,287 ****
hresults.put(SystemUtils.WINDOWS_X86, resultsWin32);
! hresults.put(SystemUtils.SUNOS_I386, resultsSunosI386);
! hresults.put(SystemUtils.SUNOS_SPARC, resultsSunosSparc);
! hresults.put(SystemUtils.AIX_POWERPC, resultsAIXPowerPc);
hresults.put(SystemUtils.MACOSX_POWERPC, resultsMacOsXPowerPc);
! hresults.put(SystemUtils.MACOSX_I386, resultsMacOsXI386);
String[] results = (String[])hresults.get(SystemUtils.getOsName());
if (results == null) {
! results = (String[])resultsWin32;
}
// Do tests
--- 264,278 ----
hresults.put(SystemUtils.WINDOWS_X86, resultsWin32);
! hresults.put(SystemUtils.SUNOS_I386, resultsUnix);
! hresults.put(SystemUtils.SUNOS_SPARC, resultsUnix);
! hresults.put(SystemUtils.AIX_POWERPC, resultsUnix);
hresults.put(SystemUtils.MACOSX_POWERPC, resultsMacOsXPowerPc);
! hresults.put(SystemUtils.MACOSX_I386, resultsMacOsXPowerPc);
! hresults.put(SystemUtils.LINUX_I686, resultsUnix);
! hresults.put(SystemUtils.LINUX_AMD64, resultsUnix);
String[] results = (String[])hresults.get(SystemUtils.getOsName());
if (results == null) {
! results = (String[])resultsUnix;
}
// Do tests
|
