LCPQ
/
qp2
mirror of https://github.com/QuantumPackage/qp2.git
9
1
Fork 0
Code Releases Activity

Update for bats 1.7

This commit is contained in:
Anthony Scemama 2023-02-06 13:42:20 +01:00
parent 28549bf042
commit ed5419390c
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/qp_test
View File

@ -60,19 +60,14 @@ def main(arguments):
print("Running tests for %s"%(bats_file)) print("Running tests for %s"%(bats_file))
print("") print("")
if arguments["-v"]: if arguments["-v"]:
p = None
if arguments["TEST"]: if arguments["TEST"]:
test = "export TEST=%s ; "%arguments["TEST"] test = "export TEST=%s ; "%arguments["TEST"]
else: else:
test = "" test = ""
try: os.system(test+" python3 bats_to_sh.py "+bats_file+
os.system(test+" python3 bats_to_sh.py "+bats_file+
"| bash") "| bash")
except:
if p:
p.terminate()
else: else:
subprocess.check_call(["bats", bats_file], env=os.environ) subprocess.check_call(["bats", "--verbose-run", "--trace", bats_file], env=os.environ)

12
configure vendored
View File

@ -99,7 +99,7 @@ PACKAGES=$(echo $PACKAGES | xargs)
echo "export QP_ROOT=\"$QP_ROOT\"" > ${QP_ROOT}/etc/00.qp_root.rc echo "export QP_ROOT=\"$QP_ROOT\"" > ${QP_ROOT}/etc/00.qp_root.rc
source quantum_package.rc source ${QP_ROOT}/quantum_package.rc
@ -246,7 +246,7 @@ EOF
execute << EOF execute << EOF
cd "\${QP_ROOT}"/external cd "\${QP_ROOT}"/external
tar --gunzip --extract --file qp2-dependencies/bse-v0.8.11.tar.gz tar --gunzip --extract --file qp2-dependencies/bse-v0.8.11.tar.gz
pip install -e basis_set_exchange-* python3 -m pip install -e basis_set_exchange-*
EOF EOF
elif [[ ${PACKAGE} = zlib ]] ; then elif [[ ${PACKAGE} = zlib ]] ; then
@ -281,8 +281,8 @@ EOF
execute << EOF execute << EOF
cd "\${QP_ROOT}"/external cd "\${QP_ROOT}"/external
tar -zxf qp2-dependencies/bats-v1.1.0.tar.gz tar -zxf qp2-dependencies/bats-v1.7.0.tar.gz
( cd bats-core-1.1.0/ ; ./install.sh \${QP_ROOT}) ( cd bats-core-1.7.0/ ; ./install.sh \${QP_ROOT})
EOF EOF
else else
@ -293,7 +293,7 @@ EOF
done done
source quantum_package.rc source ${QP_ROOT}/quantum_package.rc
NINJA=$(find_exe ninja) NINJA=$(find_exe ninja)
if [[ ${NINJA} = $(not_found) ]] ; then if [[ ${NINJA} = $(not_found) ]] ; then
@ -375,7 +375,7 @@ else
echo "" echo ""
echo "${QP_ROOT}/build.ninja does not exist," echo "${QP_ROOT}/build.ninja does not exist,"
echo "you need to specify the COMPILATION configuration file." echo "you need to specify the COMPILATION configuration file."
echo "See ./configure --help for more details." echo "See ./configure -h for more details."
echo "" echo ""
fi fi