Fix for #1326

- Use basename instead of filename in error messages when running the testsuite


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6472 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/Error.mo

@@ -615,6 +615,7 @@ protected constant list<tuple<Integer, MessageType, Severity, String>> errorTabl
 
 protected import ErrorExt;
 protected import Print;
+protected import RTOpts;
 protected import System;
 
 public function updateCurrentComponent "Function: updateCurrentComponent
@@ -981,8 +982,8 @@ algorithm
   outFilename := matchcontinue filename
     case filename
       equation
-        filename = System.stringFindString(filename, "/testsuite/");
-      then filename;
+        true = RTOpts.getRunningTestsuite();
+      then System.basename(filename);
     case filename then filename;
   end matchcontinue;
 end fixFilenameForTestsuite;

Compiler/System.mo

@@ -840,5 +840,14 @@ creates the Globally Unique IDentifier and return it as String
   external "C";
 end getUUIDStr;
 
+public function basename
+"Returns the name of the file without any leading directory path.
+See man 3 basename."
+  input String filename;
+  output String base;
+  // We need to strdup the input, so we can't use basename() directly
+  external "C" base = System_basename(filename);
+end basename;
+
 end System;
 

Compiler/runtime/systemimpl.c

@@ -44,6 +44,7 @@
 /*
  * Common includes
  */
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -424,6 +425,17 @@ RML_BEGIN_LABEL(System__strcmp)
 }
 RML_END_LABEL
 
+RML_BEGIN_LABEL(System__basename)
+{
+  const char *str = RML_STRINGDATA(rmlA0);
+  char *copy = strdup(str);
+  char *res = basename(copy); /* basename may modify the contents */
+  rmlA0 = (void*) mk_scon(res);
+  free(copy);
+  RML_TAILCALLK(rmlSC);
+}
+RML_END_LABEL
+
 RML_BEGIN_LABEL(System__stringFind)
 {
   char *str = RML_STRINGDATA(rmlA0);