Attachment #135389 for bug #253114

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 253114
Collapse All | Expand All




Dflags=$Dflags" "-Dplatform=linux.gtk
os=linux
ws=gtk
arch=x86_64

# default value to determine if eclipse should be reinstalled between running of tests
installmode="clean"

	fi
done

J2SE16flags="";
# TODO: if a 1.6 JDK and want source/target = 1.6, leave these in
# TODO: if source/target = 1.6, remove these!
#if [ ${JAVA_HOME##*1.6*}"" = "" -o ${JAVA_HOME##*16*}"" = "" -o ${JAVA_HOME##*6.0*}"" = "" -o ${JAVA_HOME##*60*}"" = "" ]; then
#	# set JavaSE-1.6 properties (-Dflags)
#	bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`;
#	J2SE16flags=$J2SE16flags" -DJavaSE-1.6=$bootclasspath"
#	J2SE16flags=$J2SE16flags" -DbundleBootClasspath=$bootclasspath"
#	J2SE16flags=$J2SE16flags" -DjavacSource=1.6"
#	J2SE16flags=$J2SE16flags" -DjavacTarget=1.6"
#	J2SE16flags=$J2SE16flags" -DbundleJavacSource=1.6"
#	J2SE16flags=$J2SE16flags" -DbundleJavacTarget=1.6"
#fi

# different ways to get the launcher and Main class
if [[ -f eclipse/startup.jar ]]; then 

  cpAndMain=`find eclipse/ -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1`" org.eclipse.equinox.launcher.Main"; 
fi

# add swt jars
cpAndMain=`find eclipse/ -name "org.eclipse.swt_*.jar" | sort | head -1`":"$cpAndMain; 
cpAndMain=`find eclipse/ -name "org.eclipse.swt.gtk.linux.${arch}_*.jar" | sort | head -1`":"$cpAndMain; 

# run tests
echo "[runtests] [`date +%H\:%M\:%S`] Launching Eclipse (installmode = $installmode with -enableassertions turned on) ..."
execCmd "$JAVA_HOME/bin/java $Xflags -enableassertions -cp $cpAndMain -ws $ws -os $os -arch $arch \
-application org.eclipse.ant.core.antRunner -data $workspaceDir -file test.xml $antTestTarget \
$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE16flags \
$properties -logger org.apache.tools.ant.DefaultLogger" $consolelog;
echo "[runtests] [`date +%H\:%M\:%S`] Eclipse test run completed. "


Lines 25-31 Link Here

(-)org.eclipse.gef.releng/builder/all/build.properties (-1 / +1 lines)
25	configs=,,*	25	configs=,,*
26	baseos=linux	26	baseos=linux
27	basews=gtk	27	basews=gtk
28	basearch=x86	28	basearch=x86_64
29	bootclasspath=${java.home}/lib/*.jar	29	bootclasspath=${java.home}/lib/*.jar
30	javacFailOnError=true	30	javacFailOnError=true
31	javacVerbose=true	31	javacVerbose=true

Lines 13-19 Link Here

(-)org.eclipse.gef.releng/builder/tests/build.properties (-1 / +1 lines)
13	configs=,,*	13	configs=,,*
14	baseos=linux	14	baseos=linux
15	basews=gtk	15	basews=gtk
16	basearch=x86	16	basearch=x86_64
17	bootclasspath=${java.home}/lib/*.jar	17	bootclasspath=${java.home}/lib/*.jar
18	javacFailOnError=true	18	javacFailOnError=true
19	javacVerbose=true	19	javacVerbose=true

Return to bug 253114

Lines 127-133 Link Here

(-)org.eclipse.gef.releng/builder/tests/configs/local/relengbuildgtk.sh (-17 / +18 lines)
127	Dflags=$Dflags" "-Dplatform=linux.gtk	127	Dflags=$Dflags" "-Dplatform=linux.gtk
128	os=linux	128	os=linux
129	ws=gtk	129	ws=gtk
130	arch=x86	130	arch=x86_64
131		131
132	# default value to determine if eclipse should be reinstalled between running of tests	132	# default value to determine if eclipse should be reinstalled between running of tests
133	installmode="clean"	133	installmode="clean"
Lines 174-192 Link Here
174	fi	174	fi
175	done	175	done
176		176
177	J2SE15flags="";	177	J2SE16flags="";
178	# TODO: if a 1.5 JDK and want source/target = 1.5, leave these in	178	# TODO: if a 1.6 JDK and want source/target = 1.6, leave these in
179	# TODO: if source/target = 1.4, remove these!	179	# TODO: if source/target = 1.6, remove these!
180	#if [ ${JAVA_HOME##1.5}"" = "" -o ${JAVA_HOME##15}"" = "" -o ${JAVA_HOME##5.0}"" = "" -o ${JAVA_HOME##50}"" = "" ]; then	180	#if [ ${JAVA_HOME##1.6}"" = "" -o ${JAVA_HOME##16}"" = "" -o ${JAVA_HOME##6.0}"" = "" -o ${JAVA_HOME##60}"" = "" ]; then
181	# # set J2SE-1.5 properties (-Dflags)	181	# # set JavaSE-1.6 properties (-Dflags)
182	# bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`;	182	# bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`;
183	# J2SE15flags=$J2SE15flags" -DJ2SE-1.5=$bootclasspath"	183	# J2SE16flags=$J2SE16flags" -DJavaSE-1.6=$bootclasspath"
184	# J2SE15flags=$J2SE15flags" -DbundleBootClasspath=$bootclasspath"	184	# J2SE16flags=$J2SE16flags" -DbundleBootClasspath=$bootclasspath"
185	# J2SE15flags=$J2SE15flags" -DjavacSource=1.5"	185	# J2SE16flags=$J2SE16flags" -DjavacSource=1.6"
186	# J2SE15flags=$J2SE15flags" -DjavacTarget=1.5"	186	# J2SE16flags=$J2SE16flags" -DjavacTarget=1.6"
187	# J2SE15flags=$J2SE15flags" -DbundleJavacSource=1.5"	187	# J2SE16flags=$J2SE16flags" -DbundleJavacSource=1.6"
188	# J2SE15flags=$J2SE15flags" -DbundleJavacTarget=1.5"	188	# J2SE16flags=$J2SE16flags" -DbundleJavacTarget=1.6"
189	#fi	189	#fi
190		190
191	# different ways to get the launcher and Main class	191	# different ways to get the launcher and Main class
192	if [[ -f eclipse/startup.jar ]]; then	192	if [[ -f eclipse/startup.jar ]]; then
Lines 197-210 Link Here
197	cpAndMain=`find eclipse/ -name "org.eclipse.equinox.launcher_*.jar" \| sort \| head -1`" org.eclipse.equinox.launcher.Main";	197	cpAndMain=`find eclipse/ -name "org.eclipse.equinox.launcher_*.jar" \| sort \| head -1`" org.eclipse.equinox.launcher.Main";
198	fi	198	fi
199		199
200	# add swt jar	200	# add swt jars
201	cpAndMain=`find eclipse/ -name "org.eclipse.swt.gtk.linux.x86_*.jar" \| sort \| head -1`":"$cpAndMain;	201	cpAndMain=`find eclipse/ -name "org.eclipse.swt_*.jar" \| sort \| head -1`":"$cpAndMain;
		202	cpAndMain=`find eclipse/ -name "org.eclipse.swt.gtk.linux.${arch}_*.jar" \| sort \| head -1`":"$cpAndMain;
202		203
203	# run tests	204	# run tests
204	echo "[runtests] [`date +%H\:%M\:%S`] Launching Eclipse (installmode = $installmode with -enableassertions turned on) ..."	205	echo "[runtests] [`date +%H\:%M\:%S`] Launching Eclipse (installmode = $installmode with -enableassertions turned on) ..."
205	execCmd "$JAVA_HOME/bin/java $Xflags -enableassertions -cp $cpAndMain -ws $ws -os $os -arch $arch \	206	execCmd "$JAVA_HOME/bin/java $Xflags -enableassertions -cp $cpAndMain -ws $ws -os $os -arch $arch \
206	-application org.eclipse.ant.core.antRunner -data $workspaceDir -file test.xml $antTestTarget \	207	-application org.eclipse.ant.core.antRunner -data $workspaceDir -file test.xml $antTestTarget \
207	$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE15flags \	208	$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE16flags \
208	$properties -logger org.apache.tools.ant.DefaultLogger" $consolelog;	209	$properties -logger org.apache.tools.ant.DefaultLogger" $consolelog;
209	echo "[runtests] [`date +%H\:%M\:%S`] Eclipse test run completed. "	210	echo "[runtests] [`date +%H\:%M\:%S`] Eclipse test run completed. "
210		211