FIXED: Fix issue on Travis-CI Linux and file paths

diff --git a/.travis.yml b/.travis.yml
index bc224c72fc9fef273b6d5da82493b6a84e1d989d..941b7fc40adbc92e207ad31a54e553ffdcc80060 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ install:
     - make
     - cd build; make
 script:
-    - cd build; ctest -V
+    - cd build; make test
 branches:
   only:
     - master

diff --git a/Sources/multimarkdown/main.c b/Sources/multimarkdown/main.c
index bed78e59f929bf15537fedc19d0286438899df4b..0697aa138e61a52b714398f89b598127c90b3080 100644 (file)
--- a/Sources/multimarkdown/main.c
+++ b/Sources/multimarkdown/main.c
@@ -478,25 +478,27 @@ int main(int argc, char** argv) {
 
                if ((extensions & EXT_TRANSCLUDE) && (a_file->count == 1)) {
                        // Perform transclusion(s)
-            
-            // Convert to absolute path for first file to enable proper path resolution
+                       
+                       // Convert to absolute path for first file to enable proper path resolution
 #ifdef PATH_MAX
-            char absolute[PATH_MAX + 1];
-            realpath(a_file->filename[0], absolute);
-            fprintf(stderr, "A->'%s'->'%s'\n",a_file->filename[0],absolute);
+                       // If PATH_MAX defined, use it
+                       char absolute[PATH_MAX + 1];
+                       realpath(a_file->filename[0], absolute);
                        folder = dirname((char *) a_file->filename[0]);
-            mmd_transclude_source(buffer, folder, absolute, format, NULL, NULL);
+                       mmd_transclude_source(buffer, folder, absolute, format, NULL, NULL);
 #else
-            char * absolute = realpath(a_file->filename[0], NULL);
-            fprintf(stderr, "B->'%s'->'%s'\n",a_file->filename[0],absolute);
+                       // If undefined, then we *should* be able to use a NULL pointer to allocate
+                       char * absolute = realpath(a_file->filename[0], NULL);
                        folder = dirname((char *) a_file->filename[0]);
-            mmd_transclude_source(buffer, folder, absolute, format, NULL, NULL);
-            free(absolute);
+                       mmd_transclude_source(buffer, folder, absolute, format, NULL, NULL);
+                       free(absolute);
 #endif
                        // Don't free folder -- owned by dirname
                }
 
                if (a_file->count == 1) {
+                       // Must do this after realpath, b/c on some OS's (e.g. Travis-CI linux)
+                       // this truncates a_file->filename[0]
                        folder = dirname((char *) a_file->filename[0]);
                }