Changeset 586383d

Timestamp:

Nov 29, 2018, 3:04:58 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

752ce6d

Parents:

3569326

Message:

[tests] [win] more windows workaround to pass strings via -D

Location:

tests

Files:

• utils_tests.h (modified) (2 diffs)
• wscript_build (modified) (1 diff)

tests/utils_tests.h

@@ -20 +20 @@
 #define PATH_MAX 1024
 #endif
+
+// This macro is used to pass a string to msvc compiler: since msvc's -D flag
+// strips the quotes, we define the string without quotes and re-add them with
+// this macro.
+
+#define REDEFINESTRING(x) #x
+#define DEFINEDSTRING(x) REDEFINESTRING(x)
 
 #ifndef AUBIO_TESTS_SOURCE
@@ -135 +142 @@
   char** argv = (char**)calloc(argc, sizeof(char*));
   argv[0] = __FILE__;
-  argv[1] = AUBIO_TESTS_SOURCE;
+  argv[1] = DEFINEDSTRING(AUBIO_TESTS_SOURCE);
   // check if the file can be read
   if ( check_source(argv[1]) ) return 1;

tests/wscript_build

@@ -25 +25 @@
             install_path = None,
             defines = ['AUBIO_UNSTABLE_API=1',
-                        'AUBIO_TESTS_SOURCE=\"{}\"'.format(test_sound_abspath)]
+                        'AUBIO_TESTS_SOURCE={}'.format(test_sound_abspath)]
        )