fix tox.ini (#9276)

(cherry picked from commit e70ce50) # Conflicts: # tox.ini
Qiskit · Dec 11, 2022 · f5670a7 · f5670a7
1 parent 1044728
commit f5670a7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tox.ini b/tox.ini
@@ -14,7 +14,11 @@ setenv =
   QISKIT_SUPRESS_PACKAGING_WARNINGS=Y
   QISKIT_TEST_CAPTURE_STREAMS=1
   QISKIT_PARALLEL=FALSE
+<<<<<<< HEAD
 passenv = RAYON_NUM_THREADS OMP_NUM_THREADS QISKIT_PARALLEL RUST_BACKTRACE SETUPTOOLS_ENABLE_FEATURES
+=======
+passenv = RAYON_NUM_THREADS, OMP_NUM_THREADS, QISKIT_PARALLEL, RUST_BACKTRACE, SETUPTOOLS_ENABLE_FEATURES, QISKIT_TESTS, QISKIT_IN_PARALLEL
+>>>>>>> e70ce5041 (fix tox.ini (#9276))
 deps = setuptools_rust  # This is work around for the bug of tox 3 (see #8606 for more details.)
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/requirements-dev.txt