From b274deda77d48575a0fbdc1dc354893fa3597b3d Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Sat, 6 Feb 2021 17:18:28 +0100
Subject: Updated tox.ini to test valgrind

---
 .travis.yml                | 29 +++++++++++++++++++++--------
 minishell_test/__main__.py |  1 +
 tox.ini                    | 18 ++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c3d705..0fb4c0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,32 @@
 language: python
+
+os:
+  - linux
+  - osx
+
 python:
   - "3.6"
   - "3.7"
   - "3.8"
   - "3.9"
 
+addons:
+  apt:
+    packages:
+      - valgrind
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update          ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install valgrind; fi
+
 install:
+  - pip install -e .
   - pip install -r requirements.txt
-  - git clone --recurse-submodule https://github.com/ouaisbrefbams/minishell ../minishell
-  - sed -i 's/-Werror//' ../minishell/Makefile ../minishell/libft/Makefile
-  - sudo apt update
-  - sudo apt install valgrind
+  - git clone --recurse-submodule https://github.com/ouaisbrefbams/minishell /tmp/minishell
+  - sed -i 's/-Werror//' /tmp/minishell/Makefile /tmp/minishell/libft/Makefile
 
 script:
-  - python -m flake8
-  - python -m mypy src
-  - ./run
-  - ./run -k pwd
+  - python -m flake8 minishell_test
+  - python -m mypy minishell_test
+  - python -m minishell_test -p /tmp/minishell
+  - python -m minishell_test -p /tmp/minishell -k pwd
diff --git a/minishell_test/__main__.py b/minishell_test/__main__.py
index a90c817..310d41c 100755
--- a/minishell_test/__main__.py
+++ b/minishell_test/__main__.py
@@ -35,6 +35,7 @@ def main(argv=None):
     config.MINISHELL_PATH = os.path.abspath(
         os.path.join(config.MINISHELL_DIR, config.MINISHELL_EXEC)
     )
+    config.VALGRIND_CMD[-1] = config.MINISHELL_PATH
 
     if config.MINISHELL_MAKE or args.make:
         try:
diff --git a/tox.ini b/tox.ini
index d391b12..8db5d81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,27 @@
 envlist = py36,py37,py38,py39
 
 [testenv]
+passenv =
+    *
+
 deps =
     flake8
     mypy
+
+allowlist_externals =
+    git
+    rm
+    valgrind
+
+commands_pre =
+    git clone --recurse-submodules git://git.cacharle.xyz/minishell /tmp/minishell
+    pip install -e .
+
 commands =
     flake8 minishell_test
     mypy minishell_test
+    python -m minishell_test -p /tmp/minishell
+    python -m minishell_test -p /tmp/minishell -k pwd
+
+commands_post =
+    rm -rf /tmp/minishell
-- 
cgit