Attachment #12407 for issue #24270

View | Details | Raw Unified | Return to issue 24270
Collapse All | Expand All

Lines 117-121 Link Here

(-)test/inter_libs_exc/makefile.mk (-1 / +1 lines)
117		117
118	$(OUT)$/misc/inter_libs.flag : $(SOLARBINDIR)$/udkapi.rdb	118	$(OUT)$/misc/inter_libs.flag : $(SOLARBINDIR)$/udkapi.rdb
119	$(RM) $(OUT)$/misc/inter_libs.flag	119	$(RM) $(OUT)$/misc/inter_libs.flag
120	+cppumaker $(CPPUMAKERFLAGS) -C -BUCR -O$(UNOUCROUT) $(TYPES) $(SOLARBINDIR)$/udkapi.rdb	120	+cppumaker -C -BUCR -O$(UNOUCROUT) $(TYPES) $(SOLARBINDIR)$/udkapi.rdb
121	touch $(OUT)$/misc/inter_libs.flag	121	touch $(OUT)$/misc/inter_libs.flag

Lines 22-27 Link Here

(-)test/inter_libs_exc/starter.cxx (+1 lines)
22	{	22	{
23	OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );	23	OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
24	printf( "starter.cxx: caught IllegalArgumentException: %s\n", msg.getStr() );	24	printf( "starter.cxx: caught IllegalArgumentException: %s\n", msg.getStr() );
		25	printf( "Test Successful\n");
25	}	26	}
26	catch (Exception & exc)	27	catch (Exception & exc)
27	{	28	{





SHL1TARGET = testacquire.uno
SHL1OBJS = $(SLOFILES)
SHL1STDLIBS = 	$(CPPUHELPERLIB)

# MacOSX needs a full library list for proper linking
.IF "$(OS)" == "MACOSX"
SHL1STDLIBS += $(CPPULIB) \
		$(SALLIB)
.ENDIF

SHL1VERSIONMAP = testacquire.map
SHL1IMPLIB = itestacquire


$(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb

TEST_JAVAUNO_ACQUIRE_UNO_URL := \
    \"'uno:socket,host=localhost,port=2083;urp;test'\"

$(BIN)$/testacquire-client$(SCRIPTEXT):
    echo java -classpath \

Lines 81-86 Link Here

(-)test/performance/testperformance.cxx (-2 / +7 lines)
81	#define ULONG_MAX 0xffffffff	81	#define ULONG_MAX 0xffffffff
82	#endif	82	#endif
83		83
		84	#ifndef CLK_TCK
		85	#include <unistd.h>
		86	#define CLK_TCK sysconf(_SC_CLK_TCK)
		87	#endif
		88
84	using namespace ::rtl;	89	using namespace ::rtl;
85	using namespace ::osl;	90	using namespace ::osl;
86	using namespace ::com::sun::star::uno;	91	using namespace ::com::sun::star::uno;
Lines 130-136 Link Here
130	OString m_descString;	135	OString m_descString;
131	};	136	};
132		137
133	void main()	138	int main()
134	{	139	{
135	// interlocked count	140	// interlocked count
136	{	141	{
Lines 217-221 Link Here
217	OUString textEnc( RTL_CONSTASCII_USTRINGPARAM( "this is a test string" ) );	222	OUString textEnc( RTL_CONSTASCII_USTRINGPARAM( "this is a test string" ) );
218	}	223	}
219	}	224	}
220		225	return 0;
221	}	226	}

Return to issue 24270

Lines 76-82 Link Here

(-)test/java_uno/acquire/makefile.mk (-2 / +9 lines)
76		76
77	SHL1TARGET = testacquire.uno	77	SHL1TARGET = testacquire.uno
78	SHL1OBJS = $(SLOFILES)	78	SHL1OBJS = $(SLOFILES)
79	SHL1STDLIBS =	79	SHL1STDLIBS = $(CPPUHELPERLIB)
		80
		81	# MacOSX needs a full library list for proper linking
		82	.IF "$(OS)" == "MACOSX"
		83	SHL1STDLIBS += $(CPPULIB) \
		84	$(SALLIB)
		85	.ENDIF
		86
80	SHL1VERSIONMAP = testacquire.map	87	SHL1VERSIONMAP = testacquire.map
81	SHL1IMPLIB = itestacquire	88	SHL1IMPLIB = itestacquire
82		89
Lines 111-117 Link Here
111	$(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb	118	$(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
112		119
113	TEST_JAVAUNO_ACQUIRE_UNO_URL := \	120	TEST_JAVAUNO_ACQUIRE_UNO_URL := \
114	\"'uno:socket,host=localhost,port=2002;urp;test'\"	121	\"'uno:socket,host=localhost,port=2083;urp;test'\"
115		122
116	$(BIN)$/testacquire-client$(SCRIPTEXT):	123	$(BIN)$/testacquire-client$(SCRIPTEXT):
117	echo java -classpath \	124	echo java -classpath \