Some changes I made while working on libnetcdf on the Anaconda Distribution recently.#971
Some changes I made while working on libnetcdf on the Anaconda Distribution recently.#971mingwandroid wants to merge 8 commits intoUnidata:masterfrom
Conversation
Because STRINGIFY is greedy and will convert all parts of the string that match any define. In my case I had -D"TOPSRCDIR=/opt/conda-linux-32/.." which got converted to "conda-1-32/.." since linux is defined as 1.
.. also adds a missing include config.h for the snprintf macro
Now the testsuite should be able to run.
|
Taking a look at this now; fwiw, the test suite already ran on Windows, it sounds like we are using the same sort of dev environment (bash via msys2, m4). Reviewing now and will get merged ASAP or will follow up. Thanks! |
|
I'm seeing failures when running Windows tests, they can be seen here: |
|
Yeah I guess (without checking mind you!) you run the tests on a completely MSYS2 setup including GCC? This is a 'mixed' setup since AD uses VC when possible. I'll take a look at the failure tomorrow, thanks! |
|
I run the tests in MSYS2 but it is pure Visual Studio; no gcc at all.
- Ward
…On May 21, 2018, 4:01 PM -0600, Ray Donnelly ***@***.***>, wrote:
Yeah I guess (without checking mind you!) you run the tests on a completely MSYS2 setup including GCC?
This is a 'mixed' setup since AD uses VC when possible. I'll take a look at the failure tomorrow, thanks!
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub, or mute the thread.
|
| * Author: Wei-keng Liao. | ||
| */ | ||
|
|
||
| #include "config.h" |
There was a problem hiding this comment.
I put this change in another current PR #1266 so that it gets into the code base. All test programs must start by including config.h. I also checked the other tests in nc_test and nc_test4 and found a bunch more places where the include was missing, so I fixed those too. Thanks for noticing this.
| #include "nc4dispatch.h" | ||
| #include <H5DSpublic.h> | ||
| #include <math.h> | ||
| #include <inttypes.h> |
There was a problem hiding this comment.
This include is already below:
#ifdef HAVE_INTTYPES_H
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#endif
Is that not working for your build?
|
|
||
| # signal success/failure | ||
| if wget -c $Q --passive-ftp $FTPFILE ; then | ||
| if wget -c $Q --passive-ftp $FTPFILE || curl -O $FTPFILE; then |
There was a problem hiding this comment.
I will add this change in one of my outstanding branches as well.
3 participants
If you want this split into separate PRs then please let me know.
I fixed it so that the test-suite can be run on Windows too (I use
MSYS2to provide a bash shell and m4) which I needed to do to track down a tricky bug which has been fixed already: #899From a VS2008 build we get some floating point format differences (leading 0s) and some minor looking accuracy ones too while a VS2015 build runs the testsuite cleanly.