buildbot: fix #5966

Conflicts: buildbot/master/master.cfg
MasterBel2 · May 3, 2018 · 430e2a7 · 430e2a7
1 parent e648c30
commit 430e2a7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
@@ -689,25 +689,25 @@ class MsvcFullBuildFactory(BuildFactory):
 
 windows_builder_test = {
 	'name': 'full-windows-test',
-	'slavenames': ['abma2'],
+	'slavenames': ['buildslave-win32'],
 	'builddir': 'full-windows-test',
 	'factory': WindowsFullBuildFactory(),
 	'env': {
 		'MINGW_HOST': 'i686-w64-mingw32-',
 		'CHOST' : 'i686-w64-mingw32',
-		'ROOT' : '/opt/mxe/usr',
+		'ROOT' : '/home/buildbot/mxe/usr',
 		'OUTPUTDIR' : 'win32',
+		'CMAKEBIN': '/home/buildbot/mxe/usr/bin/i686-w64-mingw32.static.posix-cmake',
 		'CMAKEPARAM' :
-				' -DMINGWLIBS:PATH=/slave/mingwlibs'
-				' -DCMAKE_FIND_ROOT_PATH:PATH=/opt/mxe/usr/libexec/gcc/i686-w64-mingw32/4.8.1;/usr/i686-w64-mingw32;/usr/i686-pc-linux-gnu/opt/oracle-jdk-bin-1.7.0.65/'
+				' -DMINGWLIBS:PATH=/home/buildbot/mingwlibs'
 				' -DCMAKE_SYSTEM_NAME:STRING=Windows'
 				' -DUSERDOCS_PLAIN:BOOL=ON'
 				' -DCMAKE_INSTALL_PREFIX:PATH='
 				' -G Ninja',
-		'CXX' : '/opt/mxe/usr/bin/i686-w64-mingw32-g++',
-		'CC' : '/opt/mxe/usr/bin/i686-w64-mingw32-gcc',
+		'CXX' : '/home/buildbot/mxe/usr/bin/i686-w64-mingw32.static.posix-g++',
+		'CC' : '/home/buildbot/mxe/usr/bin/i686-w64-mingw32.static.posix-gcc',
 		'MAKE' : 'ninja',
-		'MINGWLIBS_PATH' : '/slave/mingwlibs',
+		'MINGWLIBS_PATH' : '/home/buildbot/mingwlibs',
 		'MINGWLIBS_REPO_URL' : 'git://github.com/spring/mingwlibs.git',
 	}
 }