diff --git a/.travis.yml b/.travis.yml index 8f45d087637..729943b9af8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: global: - ENERGYPLUS_VERSION=EnergyPlus-9.2.0-921312fa1d-Linux-x86_64 jobs: - - TEST_ARG="make test-documentation test-experiment-setup test-autogenerated-files" + - TEST_ARG="make test-documentation test-experiment-setup test-autogenerated-files test-verify-files" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Air,Examples}\"" diff --git a/Buildings/Resources/Scripts/travis/Makefile b/Buildings/Resources/Scripts/travis/Makefile index 395006f3c7d..2c759130c59 100644 --- a/Buildings/Resources/Scripts/travis/Makefile +++ b/Buildings/Resources/Scripts/travis/Makefile @@ -31,6 +31,9 @@ test-autogenerated-files: python Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py; \ git diff --exit-code Buildings) +test-verify-files: + (cd $(ROOT)/Buildings && ../bin/verifyFiles.py) + # Test whether all EnergyPlus validation files are up to date. # This targets searches all files `run.sh` and executes them. test-energyplus-validations: diff --git a/bin/checkRelease.py b/bin/verifyFiles.py old mode 100755 new mode 100644 similarity index 93% rename from bin/checkRelease.py rename to bin/verifyFiles.py index d7987ed1db5..44ac52d06f4 --- a/bin/checkRelease.py +++ b/bin/verifyFiles.py @@ -1,20 +1,20 @@ -#!/usr/bin/python +#!/usr/bin/python3 ##################################################################### # This script checks mo and mos files for invalid syntax. -# Run this file before checking changes into the trunk. # # MWetter@lbl.gov 2011-03-06 ##################################################################### import os, string, fnmatch, os.path, sys # -------------------------- # Global settings -LIBHOME=os.path.abspath(".") +LIBHOME=os.path.join(".") # List of invalid strings # Regarding the strings __Dymola_*, see https://trac.modelica.org/Modelica/ticket/786 # for possible replacements. INVALID_IN_ALL=["fixme", "import \"", "import Buildings;", + "import IBPSA;", "