diff options
author | Timothee Cour <timothee.cour2@gmail.com> | 2019-01-15 15:17:52 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-15 15:17:52 -0800 |
commit | fbd6743ea1db89eef3dd89ceb7c0cdcb648c8055 (patch) | |
tree | 9551f706b2f7690f9396563b80aa0ea941d4412b | |
parent | 1d7e3a84fd8ebaf183a231c9f8e0159f243ee25a (diff) | |
download | Nim-fbd6743ea1db89eef3dd89ceb7c0cdcb648c8055.tar.gz |
fix sdl_test test that failed in CI cpp mode (#10314)
* fix sdl_test test that failed in CI cpp mode * preserve old code for NimInAction in `nim c` mode
-rw-r--r-- | testament/categories.nim | 4 | ||||
-rw-r--r-- | tests/niminaction/Chapter8/sdl/sdl_test.nim | 24 |
2 files changed, 20 insertions, 8 deletions
diff --git a/testament/categories.nim b/testament/categories.nim index 54b4272ee..e2b5f0a78 100644 --- a/testament/categories.nim +++ b/testament/categories.nim @@ -352,13 +352,13 @@ proc testNimInAction(r: var TResults, cat: Category, options: string) = "8b5d28e985c0542163927d253a3e4fc9", "783299b98179cc725f9c46b5e3b5381f", "1a2b3fba1187c68d6a9bfa66854f3318", - "80f9c3e594a798225046e8a42e990daf" + "391ff57b38d9ea6f3eeb3fe69ab539d3" ] for i, test in tests: let filename = testsDir / test.addFileExt("nim") let testHash = getMD5(readFile(filename).string) - doAssert testHash == refHashes[i], "Nim in Action test " & filename & " was changed." + doAssert testHash == refHashes[i], "Nim in Action test " & filename & " was changed: " & $(i: i, testHash: testHash, refHash: refHashes[i]) # Run the tests. for testfile in tests: test "tests/" & testfile & ".nim" diff --git a/tests/niminaction/Chapter8/sdl/sdl_test.nim b/tests/niminaction/Chapter8/sdl/sdl_test.nim index a49e08911..1c4d258fb 100644 --- a/tests/niminaction/Chapter8/sdl/sdl_test.nim +++ b/tests/niminaction/Chapter8/sdl/sdl_test.nim @@ -17,12 +17,24 @@ discard pollEvent(nil) renderer.setDrawColor 29, 64, 153, 255 renderer.clear renderer.setDrawColor 255, 255, 255, 255 -var points = [ - (260'i32, 320'i32), - (260'i32, 110'i32), - (360'i32, 320'i32), - (360'i32, 110'i32) -] + +when defined(c): + # just to ensure code from NimInAction still works, but + # the `else` branch would work as well in C mode + var points = [ + (260'i32, 320'i32), + (260'i32, 110'i32), + (360'i32, 320'i32), + (360'i32, 110'i32) + ] +else: + var points = [ + (260.cint, 320.cint), + (260.cint, 110.cint), + (360.cint, 320.cint), + (360.cint, 110.cint) + ] + renderer.drawLines(addr points[0], points.len.cint) renderer.present |