*not part of the buld*

blackConnect tests update


git-svn-id: svn://10.0.0.236/trunk@99925 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2001-07-25 22:05:35 +00:00
parent ad651ef17b
commit 4e0a322dbc
92 changed files with 1360 additions and 885 deletions

View File

@@ -37,9 +37,9 @@ CPPSRCS = \
X2JINClientTestComponent.cpp \
X2JINClientTestComponentFactory.cpp \
$(NULL)
XPIDLSRCS = iX2JINClientTestComponent.idl
JAVAI = iX2JINClientTestComponent.class
DSO_LDOPTS += \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
@@ -47,7 +47,3 @@ DSO_LDOPTS += \
include $(topsrcdir)/config/rules.mk
$(JAVAI)::
$(JDKHOME)/bin/javac -classpath .:$(DIST)/classes -d $(DIST)/classes $<
install:: $(JAVAI)

View File

@@ -424,11 +424,25 @@
_wstring=cstr->ToNewUnicode();
nsString str = *(new nsString(_wstring));
NS_ALLOC_STR_BUF(aBuf,str,14)
{
NS_ALLOC_STR_BUF(aBuf,str,256)
val=PR_sprintf_append(val,"%s\n",aBuf);
NS_FREE_STR_BUF(aBuf)
}
serverComponent->TestWString(_wstring);
_string=NULL;
cstr=new nsCString(_string);
_wstring=cstr->ToNewUnicode();
str = *(new nsString(_wstring));
{
NS_ALLOC_STR_BUF(aBuf1,str,256)
val=PR_sprintf_append(val,"%s\n",aBuf1);
NS_FREE_STR_BUF(aBuf1)
}
serverComponent->TestWString(_wstring);
PrintResult("x2j.in.client.wstring",val);

View File

@@ -48,4 +48,5 @@ install:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
clobber::
del /f $(DIST)\bin\components\$(DLLNAME).dll
del /f $(DIST)\bin\components\X2JIN*.xpt
del /f $(DIST)\bin\components\X2JINC*.xpt
del /f $(DIST)\bin\components\X2JINS*.xpt

View File

@@ -31,25 +31,19 @@ JAVA_OR_NSJVM = 1
include $(DEPTH)/config/autoconf.mk
export::
$(JDKHOME)/bin/javac -classpath $(CLASSPATH) -d $(JAVA_DESTPATH) iX2JINServerTestComponent.java
include $(topsrcdir)/config/rules.mk
JAVA_SRC=X2JINServerTestComponent.java
JAVAI_SRC=iX2JINServerTestComponent.java
X2JINServerTestComponent.class:
$(JDKHOME)/bin/javac -classpath $(CLASSPATH) X2JINServerTestComponent.java
X2JINServerTestComponent.jar.comp: manifest X2JINServerTestComponent.class
$(JDKHOME)/bin/jar cvfm X2JINServerTestComponent.jar.comp manifest *.class
X2JINServerTestComponent.class:
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes $(JAVA_SRC)
javai::
$(JDKHOME)/bin/javac -classpath $(DEPTH)/dist/classes -d $(DEPTH)/dist/classes $(JAVAI_SRC)
install-component: javai X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/config/config.mk
install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info
cp -f X2JINServerTestComponent.jar* $(DIST)/bin/components
clobber::

View File

@@ -271,7 +271,7 @@ System.out.println("TESTOBJ");
* C++ client side.
*/
public void testIID(IID iid) {
S=S+iid.toString()+"\n";
S=S+iid.getString()+"\n";
}
/**
@@ -279,7 +279,7 @@ System.out.println("TESTOBJ");
* C++ client side.
*/
public void testCID(CID cid) {
S=S+cid.toString()+"\n";
S=S+cid.getString()+"\n";
//CID c=new CID("1ddc5b10-9852-11d4-aa22-00a024a8bbac");
}

View File

@@ -43,8 +43,8 @@ X2JINServerTestComponent.jar.comp: manifest iX2JINServerTestComponent.class X2JI
.SUFFIXES: .java .class
.java.class:
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JINServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JINServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JINServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JINServerTestComponent.java
install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info $(DLL)
copy X2JINServerTestComponent.jar* $(DIST)\bin\components
@@ -52,6 +52,6 @@ install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.ja
clobber::
-del /f *.class *.jar.comp
-del /f $(DIST)\bin\components\X2JINServerTestComponent.jar.*
-del /f $(DIST)\..\classes\org\mozilla\xpcom\iX2JINServerTestComponent.*
clobber_all:: clobber
install:: install-component