From 66cabd6cd32848bf0d7c5c01fb4e80ef7b8c7bb8 Mon Sep 17 00:00:00 2001 From: Bonnie Jonkman Date: Tue, 1 Mar 2022 14:39:19 -0700 Subject: [PATCH] Reg_tests python scripts: fix issue where directory returned is empty When the string is empty, we had been adding "/lib" to the path instead of "./lib", which then causes the scripts to fail to find the library files. --- reg_tests/executeAerodynRegressionCase.py | 2 +- reg_tests/executeBeamdynRegressionCase.py | 2 +- reg_tests/executeFASTFarmRegressionCase.py | 2 +- reg_tests/executeHydrodynRegressionCase.py | 2 +- reg_tests/executeInflowwindPyRegressionCase.py | 2 +- reg_tests/executeInflowwindRegressionCase.py | 2 +- reg_tests/executeOpenfastAeroAcousticRegressionCase.py | 2 +- reg_tests/executeOpenfastCppRegressionCase.py | 2 +- reg_tests/executeOpenfastLinearRegressionCase.py | 2 +- reg_tests/executeOpenfastRegressionCase.py | 2 +- reg_tests/executeSubdynRegressionCase.py | 2 +- reg_tests/manualRegressionTest.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/reg_tests/executeAerodynRegressionCase.py b/reg_tests/executeAerodynRegressionCase.py index e5b4532415..1462914737 100644 --- a/reg_tests/executeAerodynRegressionCase.py +++ b/reg_tests/executeAerodynRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeBeamdynRegressionCase.py b/reg_tests/executeBeamdynRegressionCase.py index 0222aa0bcd..93dbc01f74 100644 --- a/reg_tests/executeBeamdynRegressionCase.py +++ b/reg_tests/executeBeamdynRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeFASTFarmRegressionCase.py b/reg_tests/executeFASTFarmRegressionCase.py index 34acdf28cb..273637bb46 100644 --- a/reg_tests/executeFASTFarmRegressionCase.py +++ b/reg_tests/executeFASTFarmRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.sep.join(sys.argv[0].split(os.path.sep)[:-1]) if os.path.sep in sys.argv[0] else "." +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeHydrodynRegressionCase.py b/reg_tests/executeHydrodynRegressionCase.py index cc7255f2b1..2c442eb6ba 100644 --- a/reg_tests/executeHydrodynRegressionCase.py +++ b/reg_tests/executeHydrodynRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeInflowwindPyRegressionCase.py b/reg_tests/executeInflowwindPyRegressionCase.py index 27fc4aed84..7d88591ba9 100644 --- a/reg_tests/executeInflowwindPyRegressionCase.py +++ b/reg_tests/executeInflowwindPyRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.sep.join(sys.argv[0].split(os.path.sep)[:-1]) if os.path.sep in sys.argv[0] else "." +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeInflowwindRegressionCase.py b/reg_tests/executeInflowwindRegressionCase.py index 0956b0bd3b..42c99d6289 100644 --- a/reg_tests/executeInflowwindRegressionCase.py +++ b/reg_tests/executeInflowwindRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.sep.join(sys.argv[0].split(os.path.sep)[:-1]) if os.path.sep in sys.argv[0] else "." +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeOpenfastAeroAcousticRegressionCase.py b/reg_tests/executeOpenfastAeroAcousticRegressionCase.py index 37c5f598ec..381879eb25 100644 --- a/reg_tests/executeOpenfastAeroAcousticRegressionCase.py +++ b/reg_tests/executeOpenfastAeroAcousticRegressionCase.py @@ -25,7 +25,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeOpenfastCppRegressionCase.py b/reg_tests/executeOpenfastCppRegressionCase.py index db2ba62ee6..d467d1ac2e 100644 --- a/reg_tests/executeOpenfastCppRegressionCase.py +++ b/reg_tests/executeOpenfastCppRegressionCase.py @@ -16,7 +16,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeOpenfastLinearRegressionCase.py b/reg_tests/executeOpenfastLinearRegressionCase.py index 8d9ed8964f..8e8a9b7015 100644 --- a/reg_tests/executeOpenfastLinearRegressionCase.py +++ b/reg_tests/executeOpenfastLinearRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeOpenfastRegressionCase.py b/reg_tests/executeOpenfastRegressionCase.py index a67a77a969..2bb1bb14ca 100644 --- a/reg_tests/executeOpenfastRegressionCase.py +++ b/reg_tests/executeOpenfastRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/executeSubdynRegressionCase.py b/reg_tests/executeSubdynRegressionCase.py index 4ca9e63212..94e04a710f 100644 --- a/reg_tests/executeSubdynRegressionCase.py +++ b/reg_tests/executeSubdynRegressionCase.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import shutil diff --git a/reg_tests/manualRegressionTest.py b/reg_tests/manualRegressionTest.py index 551870e8ce..50b9dac8a5 100644 --- a/reg_tests/manualRegressionTest.py +++ b/reg_tests/manualRegressionTest.py @@ -24,7 +24,7 @@ import os import sys -basepath = os.path.dirname(__file__) +basepath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, os.path.sep.join([basepath, "lib"])) import argparse import subprocess