Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
Fix path names for compliance suite
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - #2572
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Jul 8, 2018
1 parent 66b19e0 commit 578550f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Examples/ComplianceSuite.mos
@@ -1,7 +1,7 @@
// Runs the ModelicaCompliance suite
// Default output is the files "openmodelica.xml" and "openmodelica.html", which is a valid jUnit testcase and possible to generate html reports from (the generated file is one example, using the default xsl)
// A file called "openmodelica.ignore.xml" is also generated, which can be used together with a file to mark skipped tests (they still run to see if the results have improved)
// COMPLIANCEEXTRAOMFLAGS=-d=newInst COMPLIANCEEXTRAREPORTFLAGS=--prefix=openmodelica-newinst can be used as well
// COMPLIANCEEXTRAOMFLAGS=-d=newInst COMPLIANCEPREFIX=openmodelica-newinst can be used as well

setCommandLineOptions("-g=Modelica");
loadModel(ModelicaCompliance);getErrorString();
Expand All @@ -10,6 +10,10 @@ writeFile("version","omc "+getVersion()+" compliance suite "+getVersion(Modelica

COMPLIANCEEXTRAOMFLAGS := getEnvironmentVar("COMPLIANCEEXTRAFLAGS");
COMPLIANCEEXTRAREPORTFLAGS := getEnvironmentVar("COMPLIANCEEXTRAREPORTFLAGS");
COMPLIANCEPREFIX := getEnvironmentVar("COMPLIANCEPREFIX");
if COMPLIANCEPREFIX=="" then
COMPLIANCEPREFIX := "openmodelica";
end if;

loadString("
function last
Expand Down Expand Up @@ -73,5 +77,5 @@ getErrorString();

filename := OpenModelica.Scripting.uriToFilename("modelica://ModelicaCompliance/Resources/tools/xml-report/report.xsl");getErrorString();
system_parallel(commands);getErrorString();
system("python3 "+getInstallationDirectoryPath()+"/share/doc/omc/testmodels/ComplianceSuite.py --version=\"`cat version`\"" + COMPLIANCEEXTRAREPORTFLAGS);getErrorString();
system("xsltproc -o openmodelica.html '" + filename + "' openmodelica.xml");getErrorString();
system("python3 "+getInstallationDirectoryPath()+"/share/doc/omc/testmodels/ComplianceSuite.py --version=\"`cat version`\" --outPrefix=\"" + COMPLIANCEPREFIX + "\" " + COMPLIANCEEXTRAREPORTFLAGS);getErrorString();
system("xsltproc -o "+COMPLIANCEPREFIX+".html '" + filename + "' "+COMPLIANCEPREFIX+".xml");getErrorString();

0 comments on commit 578550f

Please sign in to comment.