Build and run tests for the MSSQL Driver on Appveyor #5990
Conversation
* Add MSSQL to CI * Update db script and Python tests * Turn off shallow_clone to clone msautotest * Restrict clone size * Add mssql test case and results * Build MSSQL driver * Remove include directory that breaks build * Set projection and update results paths * Use file protocol for pip * Change test order * Add MSSQL to CI * Update db script and Python tests * Turn off shallow_clone to clone msautotest * Fix YAML issues with % * Add full path to work on Windows * Ignore test on Windows as it fails * Update test and skip failing tests * Fix some compiler warnings and disable the rest
Really ? Can you show them ? Simple casts should hopefully fix the warnings. For mapmssql2008.c(909), the right fix is probably using %u instead of %d |
I added a few changes using size_t instead but these caused issues in the x32 build e.g. The attempt to fix them was in this commit - but I soon realised I was doing more harm than good. I looked at #5873 for some hints but didn't see examples of int/size_t fixes. I'll attempt the suggested approach of casts for some of the other errors. |
|
@rouault - I've re-enabled the complier warnings and used casts and changed types to fix these. See this commit for changes. The Initial warnings prior to commit were as follows: |
mapmssql2008.c
Outdated
| @@ -690,10 +690,10 @@ static char *strstrIgnoreCase(const char *haystack, const char *needle) | |||
| { | |||
| char *hay_lower; | |||
| char *needle_lower; | |||
| int len_hay,len_need; | |||
| size_t len_hay,len_need, match; | |||
| int found = -1; | |||
There was a problem hiding this comment.
The bool type isn't available (at least not for me using MSVC). I've updated to use MS_FALSE and MS_TRUE for clarity.
mapmssql2008.c
Outdated
| @@ -715,12 +715,13 @@ static char *strstrIgnoreCase(const char *haystack, const char *needle) | |||
| loc = strstr(hay_lower, needle_lower); | |||
| if(loc) { | |||
| match = loc - hay_lower; | |||
| found = 1; | |||
mapmssql2008.c
Outdated
| } | ||
|
|
||
| msFree(hay_lower); | ||
| msFree(needle_lower); | ||
|
|
||
| return (char *) (match < 0 ? NULL : haystack + match); | ||
| return (char *) (found < 0 ? NULL : haystack + match); |
There was a problem hiding this comment.
return (char *) (!found ? NULL : haystack + match);
This pull request adds msautotests for the MSSQL MapServer driver, and runs them as part of the Windows Appveyor build.
Appveyor has a MSSQL 2017 database service added. A test database is created with a couple of shapefiles imported using
ogr2ogr. Appveyorshallow_clonewas disabled as themsautotestsuite is not available by the GitHub HTTP download (it is in the .gitignore list). The-DWITH_MSSQL2008=1setting was added to the CMake command.The line
include_directories(${ODBC_INCLUDE_DIR})was removed from CMakeLists.txt as it caused build errors. See https://ci.appveyor.com/project/SethG/mapserver/build/job/o3ch02bfevwwcrkc for an example where errors such as those below are listed. I believe this is due to WINAPI being redefined/undefined when including all the files inODBC_INCLUDE_DIR(which isC:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\um\on Appveyor):A first test MAP file was created based on the existing
filters_postgis.mapfile to test MSSQL driver functionality. SeveralFILTERoptions don't work with the MSQL driver so these are currently ignored (a separate issue can be created for these).Code warnings have been suppressed for
mapmssql2008.cas my attempts to fix them caused memory issues, and not suppressing them cause the build test to fail. A few code issues are listed below.Finally the
msautotest/mspythontests recently updated by @rouault in #5984 are also now run on Appveyor/Windows. There were a couple of minor path changes to get all of these to pass. There was one failing test I couldn't resolve so this is skipped on Windows with the following line:@pytest.mark.skipif(sys.platform == 'win32', reason="Fails on Windows")