Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Next step is to resume hunting down the DOM bug.

Browse Source 
M dom/src/Makefile.in

- conditional builds to work properly XP

M webclient/build-tests.xml

- pass MOZ_SRC to test environment to enable absolute pathing to golden
  files

M webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java

- Leverage MOZ_SRC to get absolute pathing to golden files
This commit is contained in:
edburns%acm.org 2005-08-09 04:43:00 +00:00
parent 6413cad387
commit fdbc87a6d5
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/dom/src/Makefile.in
View File

@ -62,7 +62,8 @@ ifeq ($(OS_ARCH),Darwin)
INCLUDES += -I$(MOZ_JDKHOME)/include -I.
DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
DLL_SUFFIX = .jnilib
else
endif #DARWIN
ifeq ($(OS_ARCH),Linux)
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
DSO_LDOPTS += \
@ -74,12 +75,14 @@ ifeq ($(OS_ARCH),Linux)
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
-ljvm -lhpi
DEFINES += -DDISABLE_JIT
endif # LINUX
ifeq ($(OS_ARCH),WINNT)
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/win32
EXTRA_LIBS += \
$(JAVAHOME)/lib/jvm.lib \
$(NULL)
else
endif # WINNT
ifeq (($OS_ARCH),SunOS)
INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
DSO_LDOPTS += \
-L$(JAVAHOME)/jre/lib/sparc \
@ -90,10 +93,8 @@ else
-R$(JAVAHOME)/jre/lib/sparc/native_threads \
-ljvm -lhpi
endif
endif
endif
# ifeq (($OS_ARCH),SunOS)
#
EXPORTS = \
nsIJavaDOM.h

1
java/webclient/build-tests.xml
View File

@ -152,6 +152,7 @@
<jvmarg value="-Djava.library.path=${myenv.MOZILLA_FIVE_HOME}${PATH_SEP}${myenv.MOZILLA_FIVE_HOME}/components"/>
<jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
<jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
<jvmarg value="-DMOZ_SRC=${myenv.MOZ_SRC}"/>
<jvmarg value="-DBROWSER_BIN_DIR=${myenv.MOZILLA_FIVE_HOME}"/>
<sysproperty key="native.waitForDebugger"
value="${native.waitForDebugger}"/>

15
java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
View File

@ -1,5 +1,5 @@
/*
* $Id: WebclientTestCase.java,v 1.8 2004/09/03 19:04:22 edburns%acm.org Exp $
* $Id: WebclientTestCase.java,v 1.9 2005/08/09 04:43:00 edburns%acm.org Exp $
*/
/*
@ -50,7 +50,7 @@ import org.mozilla.util.THTTPD;
*
* <B>Lifetime And Scope</B> <P>
*
* @version $Id: WebclientTestCase.java,v 1.8 2004/09/03 19:04:22 edburns%acm.org Exp $
* @version $Id: WebclientTestCase.java,v 1.9 2005/08/09 04:43:00 edburns%acm.org Exp $
*
* @see Blah
* @see Bloo
@ -65,7 +65,7 @@ public abstract class WebclientTestCase extends TestCase
public static final String WEBCLIENTSTUB_LOG_MODULE = "webclientstub";
public static final String WEBCLIENT_LOG_MODULE = "webclient";
public static final String OUTPUT_FILE_ROOT = "./build.test/";
public static String OUTPUT_FILE_ROOT = "build.test/";
//
// Class Variables
@ -106,6 +106,15 @@ public WebclientTestCase(String name)
public void setUp()
{
verifyPreconditions();
String mozSrcValue = null;
assertTrue(null != (mozSrcValue =
System.getProperty("MOZ_SRC")));
OUTPUT_FILE_ROOT = mozSrcValue + File.separator +
"mozilla" + File.separator + "java" + File.separator +
"webclient" + File.separator + OUTPUT_FILE_ROOT;
}
//