From a4f2cdbb06a2b3a65c7ec6f8e38acb00cce14169 Mon Sep 17 00:00:00 2001 From: Jenkins Build Server Date: Fri, 22 Apr 2016 17:27:54 +0200 Subject: [PATCH] 50710 18057 Two tests for OSWindow now failing on Linux and Win https://pharo.fogbugz.com/f/cases/18057 http://files.pharo.org/image/50/50710.zip --- .../instance/baselines/baseline08_.st | 44 +++++++++++++++++++ .../symbolic versions/development_.st | 2 +- .../instance/symbolic versions/stable_.st | 2 +- .../instance/versions/version129_.st | 21 +++++++++ .../instance/tests/testNewWindowDefaults.st | 2 +- .../instance/tests/testSettingUpWindow.st | 2 +- .../{script50709.st => script50710.st} | 2 +- .../instance/pharo - updates/update50709.st | 15 ------- .../instance/pharo - updates/update50710.st | 8 ++++ .../public/commentForCurrentUpdate.st | 6 +-- 10 files changed, 80 insertions(+), 24 deletions(-) create mode 100644 ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/baselines/baseline08_.st create mode 100644 ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/versions/version129_.st rename ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/{script50709.st => script50710.st} (99%) delete mode 100644 ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50709.st create mode 100644 ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50710.st diff --git a/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/baselines/baseline08_.st b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/baselines/baseline08_.st new file mode 100644 index 0000000000..0b54972780 --- /dev/null +++ b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/baselines/baseline08_.st @@ -0,0 +1,44 @@ +baseline08: spec + + + spec for: #'common' do: [ + spec blessing: #'baseline'. + spec repository: 'http://smalltalkhub.com/mc/Pharo/OSWindow/main/'. + spec + project: 'Athens' with: [ + spec + className: #ConfigurationOfAthens; + versionString: #'stable'; + repository: 'http://smalltalkhub.com/mc/Pharo/Athens/main/' ]; + project: 'UFFIOpenGL' with: [ + spec + className: #ConfigurationOfUFFIOpenGL; + versionString: #'stable'; + repository: 'http://smalltalkhub.com/mc/ronsaldo/UFFIOpenGL/main/' ]. + spec + package: 'OSWindow-Core'; + package: 'OSWindow-SDL2' with: [ + spec requires: #('OSWindow-Core' 'Athens' ). ]; + package: 'OSWindow-VM' with: [ + spec requires: #('OSWindow-Core' ). ]; + package: 'NBXLib-Core'; + package: 'OSWindow-X11' with: [ + spec requires: #('OSWindow-Core' 'NBXLib-Core' ). ]; + package: 'OSWindow-TUIO'; + package: 'OSWindow-SDL2-Examples'; + package: 'OSWindow-GLExample' with: [ + spec requires: #('UFFIOpenGL' ). ]; + package: 'OSWindow-Tests' with: [ + spec requires: #('OSWindow-Core' ). ]. + spec + group: 'WithOpenGL' with: #('Legacy' 'SDL2' 'OpenGL' ); + group: 'default' with: #('Legacy' 'SDL2' 'Examples' ); + group: 'OpenGLExamples' with: #('OSWindow-GLExample' ); + group: 'X11' with: #('OSWindow-X11' ); + group: 'Examples' with: #('SDL2-Examples' ); + group: 'SDL2' with: #('OSWindow-SDL2' 'OSWindow-Core' 'OSWindow-Tests' ); + group: 'WithOpenGLAndExamples' with: #('Legacy' 'SDL2' 'OpenGLExamples' ); + group: 'SDL2-Examples' with: #('OSWindow-SDL2-Examples' 'SDL2' ); + group: 'Legacy' with: #('OSWindow-VM' ); + group: 'OpenGL' with: #(); + group: 'TUIO' with: #('SDL2' 'OSWindow-TUIO' ). ]. diff --git a/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/development_.st b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/development_.st index 1d0e8ab3cf..12ba79a32f 100644 --- a/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/development_.st +++ b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/development_.st @@ -1,4 +1,4 @@ development: spec - spec for: #'common' version: '0.7-baseline'. + spec for: #'common' version: '0.8-baseline'. diff --git a/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/stable_.st b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/stable_.st index 434441a787..2f1e922b6f 100644 --- a/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/stable_.st +++ b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/symbolic versions/stable_.st @@ -1,4 +1,4 @@ stable: spec - spec for: #'common' version: '1.2.8'. + spec for: #'common' version: '1.2.9'. diff --git a/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/versions/version129_.st b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/versions/version129_.st new file mode 100644 index 0000000000..a1a703a1cf --- /dev/null +++ b/ConfigurationOfOSWindow.package/ConfigurationOfOSWindow.class/instance/versions/version129_.st @@ -0,0 +1,21 @@ +version129: spec + + + spec for: #'common' do: [ + spec blessing: #'stable'. + spec description: 'version 1.2.9'. + spec author: 'RonieSalgado'. + spec timestamp: '4/22/2016 14:25'. + spec + project: 'Athens' with: '3.9.3'; + project: 'UFFIOpenGL' with: '1.0.1'. + spec + package: 'OSWindow-Core' with: 'OSWindow-Core-RonieSalgado.104'; + package: 'OSWindow-SDL2' with: 'OSWindow-SDL2-RonieSalgado.95'; + package: 'OSWindow-VM' with: 'OSWindow-VM-MerwanOuddane.4'; + package: 'NBXLib-Core' with: 'NBXLib-Core'; + package: 'OSWindow-X11' with: 'OSWindow-X11'; + package: 'OSWindow-TUIO' with: 'OSWindow-TUIO'; + package: 'OSWindow-SDL2-Examples' with: 'OSWindow-SDL2-Examples-RonieSalgado.12'; + package: 'OSWindow-GLExample' with: 'OSWindow-GLExample'; + package: 'OSWindow-Tests' with: 'OSWindow-Tests-RonieSalgado.3'. ]. diff --git a/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testNewWindowDefaults.st b/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testNewWindowDefaults.st index 636c020f66..8e63fce7f9 100644 --- a/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testNewWindowDefaults.st +++ b/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testNewWindowDefaults.st @@ -2,7 +2,7 @@ testNewWindowDefaults | window | - window := OSWindow new. + window := OSWindow newWithNullDriver. [ self assert: (window isValid). diff --git a/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testSettingUpWindow.st b/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testSettingUpWindow.st index 72b0fb399d..6f6eb40dae 100644 --- a/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testSettingUpWindow.st +++ b/OSWindow-Tests.package/OSWindowTest.class/instance/tests/testSettingUpWindow.st @@ -2,7 +2,7 @@ testSettingUpWindow | window | - window := OSWindow new. + window := OSWindow newWithNullDriver. [ window extent: 150@150. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50709.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50710.st similarity index 99% rename from ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50709.st rename to ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50710.st index 35b2c6e68b..62ba9e663d 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50709.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50710.st @@ -1,4 +1,4 @@ -script50709 +script50710 ^ 'AST-Core-TheIntegrator.411.mcz AST-FFI-Pharo50Compatibility-EstebanLorenzano.1.mcz diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50709.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50709.st deleted file mode 100644 index f5e8324846..0000000000 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50709.st +++ /dev/null @@ -1,15 +0,0 @@ -update50709 - "self new update50709" - SmalltalkImage compilerClass: Compiler. -. - self withUpdateLog: '18052 Reformatting a method should never break the code - https://pharo.fogbugz.com/f/cases/18052 - -'. - self loadTogether: self script50709 merge: false. - SmalltalkImage compilerClass: OpalCompiler. -#('BlueInk-Core' 'BlueInk-Tests') do: [ :pckgName | - (RPackageOrganizer default packageNamed: pckgName) - classes do: [ :cl | cl compileAll ] ]. - self flushCaches. -self cleanRepositories. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50710.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50710.st new file mode 100644 index 0000000000..0378491499 --- /dev/null +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50710.st @@ -0,0 +1,8 @@ +update50710 + "self new update50710" + self withUpdateLog: '18057 Two tests for OSWindow now failing on Linux and Win + https://pharo.fogbugz.com/f/cases/18057'. + self loadTogether: self script50710 merge: false. + self loadConfiguration: 'OSWindow' version: '1.2.9'. +SDL2Constants initialize. SDL_Event initialize. + self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st index bd149039d6..eb1db2ae93 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st @@ -1,5 +1,3 @@ commentForCurrentUpdate - ^ '18052 Reformatting a method should never break the code - https://pharo.fogbugz.com/f/cases/18052 - -' \ No newline at end of file + ^ '18057 Two tests for OSWindow now failing on Linux and Win + https://pharo.fogbugz.com/f/cases/18057' \ No newline at end of file