--- a/RegressionTests__MakefileTests.st Wed Oct 26 22:45:14 2016 +0100
+++ b/RegressionTests__MakefileTests.st Sat Nov 05 22:22:48 2016 +0000
@@ -47,10 +47,10 @@
| cmd |
OperatingSystem isMSWINDOWSlike ifTrue:[
- OperatingSystem getCCDefine = '__BORLANDC__' ifTrue:[
+ STCCompilerInterface getCCDefine = '__BORLANDC__' ifTrue:[
cmd := 'bmake.bat ' , target.
].
- OperatingSystem getCCDefine = '__MINGW32__' ifTrue:[
+ STCCompilerInterface getCCDefine = '__MINGW32__' ifTrue:[
(OperatingSystem getEnvironment: 'MINGW_DIR') isNil ifTrue:[
self assert: 'C:\MINGW' asFilename exists description: 'MINGW_DIR environment variable not set and C:\MINGW does not exist'.
OperatingSystem setEnvironment: 'MINGW_DIR' to: 'C:\MINGW'.
@@ -60,7 +60,7 @@
OperatingSystem setEnvironment: 'PATH' to: (OperatingSystem getEnvironment: 'PATH') , ';C:\MINGW\bin'.
cmd := 'mingwmake.bat ' , target.
].
- OperatingSystem getCCDefine = '__MINGW64__' ifTrue:[
+ STCCompilerInterface getCCDefine = '__MINGW64__' ifTrue:[
(OperatingSystem getEnvironment: 'MINGW_DIR') isNil ifTrue:[
self assert: 'C:\MINGW64' asFilename exists description: 'MINGW_DIR environment variable not set and C:\MINGW does not exist'.
OperatingSystem setEnvironment: 'MINGW_DIR' to: 'C:\MINGW64'.
@@ -74,12 +74,12 @@
cmd := 'make -f Makefile.init ', target
].
self
- assert: (OperatingSystem executeCommand: cmd inDirectory: packageDir)
- description: 'Failed to make target ''', target, ''' in test package'.
+ assert: (OperatingSystem executeCommand: cmd inDirectory: packageDir)
+ description: 'Failed to make target ''', target, ''' in test package'.
"Created: / 14-08-2013 / 18:26:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 19-11-2013 / 18:49:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-12-2015 / 14:45:20 / jv"
+ "Modified: / 05-11-2016 / 22:18:36 / jv"
! !
!MakefileTests methodsFor:'running'!