Skip to content

Commit a45c191

Browse files
authored
Merge pull request #1285 from karpierz/fix_for_run_tests_py2.bat
fix of inconvenient inconsistency in test/run_tests_py2.bat [Please add to TODO]
2 parents 4fc9393 + 10fbf42 commit a45c191

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

run_scapy_py2.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
2-
set PYTHONPATH=%cd%
2+
set PYTHONPATH=%~dp0
33
set PYTHONDONTWRITEBYTECODE=True
44
if "%1"=="--nopause" (
55
set nopause="True"

run_scapy_py3.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
2-
set PYTHONPATH=%cd%
2+
set PYTHONPATH=%~dp0
33
set PYTHONDONTWRITEBYTECODE=True
44
if "%1"=="--nopause" (
55
set nopause="True"

test/run_tests_py2.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@echo off
22
title UTscapy - All tests - PY2
3-
set MYDIR=%cd%\..
3+
set MYDIR=%~dp0\..
44
set PYTHONPATH=%MYDIR%
5+
set PYTHONDONTWRITEBYTECODE=True
56
if [%1]==[] (
67
python "%MYDIR%\scapy\tools\UTscapy.py" -c configs\\windows2.utsc -T bpf.uts -T linux.uts -o scapy_regression_test_%date:~6,4%_%date:~3,2%_%date:~0,2%.html
78
) else (

test/run_tests_py3.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22
title UTscapy - All tests - PY3
3-
set MYDIR=%cd%\..
3+
set MYDIR=%~dp0\..
44
set PYTHONPATH=%MYDIR%
55
set PYTHONDONTWRITEBYTECODE=True
66
if [%1]==[] (

0 commit comments

Comments
 (0)