Skip to content

Commit

Permalink
Use consistent python version for integration tests
Browse files Browse the repository at this point in the history
On systems where `python` points to Python 2 by default,
using a mixture of calls to `python` and `python3` leads
to an inconsistent environment missing required
dependencies.
  • Loading branch information
lava committed May 27, 2022
1 parent 7ff1944 commit eba7c29
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions vast/CMakeLists.txt
Expand Up @@ -80,9 +80,9 @@ file(
python3 -m venv \"$env_dir\"
fi
. \"$env_dir/bin/activate\"
python -m pip install --upgrade pip
python -m pip install -r \"$base_dir/requirements.txt\"
python \"$base_dir/integration.py\" \
python3 -m pip install --upgrade pip
python3 -m pip install -r \"$base_dir/requirements.txt\"
python3 \"$base_dir/integration.py\" \
--app \"$app\" \
--directory vast-integration-test \
--set \"$base_dir\"/vast_integration_suite.yaml \
Expand All @@ -92,7 +92,7 @@ file(
mkdir -p \"${CMAKE_CURRENT_BINARY_DIR}/lsvast-integration-test\"
$app --bare-mode -N -d \"${CMAKE_CURRENT_BINARY_DIR}/lsvast-integration-test/vast.db\" \
import -r \"$base_dir\"/data/suricata/eve.json suricata
python \"$base_dir/integration.py\" \
python3 \"$base_dir/integration.py\" \
--app \"$<TARGET_FILE:lsvast>\" \
--directory \"${CMAKE_CURRENT_BINARY_DIR}/lsvast-integration-test\" \
--set \"$base_dir\"/lsvast_integration_suite.yaml \
Expand Down

0 comments on commit eba7c29

Please sign in to comment.