Changeset bab4611

Timestamp:

Nov 29, 2018, 12:34:39 AM (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:

a334368

Parents:

cb288f2

Message:

[tests] fix unmatched parenthesis on windows

File:

• tests/utils_tests.h (modified) (4 diffs)

tests/utils_tests.h

@@ -20 +20 @@
 #define PATH_MAX 1024
 #endif
+
+#define DEFAULT_TEST_FILE "python/tests/sounds/44100Hz_44100f_sine441.wav"
 
 #ifdef HAVE_C99_VARARGS_MACROS
@@ -66 +68 @@
   int seed = tm_struct->tm_sec + (size_t)tm_address;
   //PRINT_WRN("current seed: %d\n", seed);
-  srandom (seed);
+  srandom ((unsigned int)seed);
 }
 
@@ -85 +87 @@
 }
 
-#elif (defined(HAVE_WIN_HACKS) //&& !defined(__GNUC__))
+#elif defined(HAVE_WIN_HACKS) //&& !defined(__GNUC__)
 // windows workaround, where mkstemp does not exist...
 int create_temp_sink(char *templ)
@@ -113 +115 @@
 #endif
 
+// pass progname / default
+int run_on_default_source( int main(int, char**) )
+{
+  int argc = 2;
+  char* argv[argc];
+  argv[0] = __FILE__;
+  // when running from waf build
+  argv[1] = "../../" DEFAULT_TEST_FILE;
+  // when running from source root directory
+  if ( access(argv[1], R_OK) )
+      argv[1] = DEFAULT_TEST_FILE;
+  // no file found
+  if ( access(argv[1], R_OK) != 0 )
+      return 1;
+  return main(argc, argv);
+}
+
+int run_on_default_source_and_sink( int main(int, char**) )
+{
+  int argc = 3, err;
+  char* argv[argc];
+  argv[0] = __FILE__;
+  // when running from waf build
+  argv[1] = "../../" DEFAULT_TEST_FILE;
+  // when running from source root directory
+  if ( access(argv[1], R_OK) )
+      argv[1] = DEFAULT_TEST_FILE;
+  // no file found
+  if ( access(argv[1], R_OK) != 0 )
+      return 1;
+  char sink_path[PATH_MAX] = "tmp_aubio_XXXXXX";
+  int fd = mkstemp(sink_path);
+  if (!fd) return 1;
+  argv[2] = sink_path;
+  err = main(argc, argv);
+  unlink(sink_path);
+  close(fd);
+  return err;
+}
 
 int run_on_default_sink( int main(int, char**) )