Merge pull request #62 from alainmarcel/alainmarcel-patch-1
fixed a test executing in wrong directory
diff --git a/tests/BuildOVMPkg/cmd b/tests/BuildOVMPkg/cmd
deleted file mode 100644
index d1715c9..0000000
--- a/tests/BuildOVMPkg/cmd
+++ /dev/null
@@ -1 +0,0 @@
-"${PROJECT_DIR}/${OUTPUT_PATH}" -create_cache -profile +incdir+../../../UVM/ovm-2.1.2/src/ +incdir+../../../UVM/vmm-1.1.1a/sv ../../../UVM/ovm-2.1.2/src/ovm_pkg.sv -write_pp -verbose -mt 0 -parse -nocache
\ No newline at end of file
diff --git a/tests/DiffSimpleIncludeAndMacros/cmd b/tests/DiffSimpleIncludeAndMacros/cmd
deleted file mode 100644
index b6abe38..0000000
--- a/tests/DiffSimpleIncludeAndMacros/cmd
+++ /dev/null
@@ -1 +0,0 @@
-top.v
diff --git a/tests/SimpleCmdLineTest/@@BAD_SYMBOL@@work/builtin.sv.slpp b/tests/SimpleCmdLineTest/@@BAD_SYMBOL@@work/builtin.sv.slpp
deleted file mode 100644
index d664dea..0000000
--- a/tests/SimpleCmdLineTest/@@BAD_SYMBOL@@work/builtin.sv.slpp
+++ /dev/null
Binary files differ
diff --git a/tests/SimpleCmdLineTest/SimpleCmdLineTest_diff.log b/tests/SimpleCmdLineTest/SimpleCmdLineTest_diff.log
deleted file mode 100644
index 67f9697..0000000
--- a/tests/SimpleCmdLineTest/SimpleCmdLineTest_diff.log
+++ /dev/null
@@ -1,28 +0,0 @@
-********************************************
-* SURELOG System Verilog Compiler/Linter *
-********************************************
-
-[INFO :CM0023] Creating log file ./slpp_all/surelog.log.
-
-[WARNI:CM0010] Command line argument "-bad" ignored.
-
-[NOTE :CM0009] Command line argument "+libreorder" ignored.
-
-[INFO :PP0122] Preprocessing source file "/home/alain/Surelog/src/dist/surelog/bin/../sv/builtin.sv".
-
-[INFO :PP0122] Preprocessing source file "top.v".
-
-[INFO :PP0122] Preprocessing source file "/home/alain/Surelog/src/Testcases/SimpleCmdLineTest/cell.v".
-
-[ FATAL] : 0
-[ ERROR] : 0
-[WARNING] : 1
-[ NOTE] : 1
-
-********************************************
-* End SURELOG SVerilog Compiler/Linter *
-********************************************
-
-0.12user 0.01system 0:00.14elapsed 95%CPU (0avgtext+0avgdata 39896maxresident)k
-48inputs+32outputs (0major+9628minor)pagefaults 0swaps
-sh: 2: -mt: not found
diff --git a/tests/SimpleCmdLineTest/TestBasic.log b/tests/SimpleCmdLineTest/TestBasic.log
index 67ebf6f..7fe9dc8 100644
--- a/tests/SimpleCmdLineTest/TestBasic.log
+++ b/tests/SimpleCmdLineTest/TestBasic.log
@@ -2,81 +2,21 @@
* SURELOG System Verilog Compiler/Linter *
********************************************
- ------------ SURELOG HELP --------------
+[INFO :CM0023] Creating log file ../../build/tests/TestBasic/slpp_all/surelog.log.
-STANDARD VERILOG COMMAND LINE:
- -f <file> Accepts a file containing command line arguments
- -v <file> Library file
- -y <path> Library directory
- +incdir+<dir>+... Specifies include paths
- -Idir Specifies include paths
- +libext+<extname>+... Specifies the library extensions
- <file>.v Verilog File
- <file>.sv System Verilog File
- +liborder Lib Order option (ignored)
- +librescan Lib Rescan option (ignored)
- +libverbose Lib Verbose option (ignored)
- +nolibcell No Lib Cell option (ignored)
- +define+macro_name=definition+...
- Defines a macro and optionally its value
- -L <libName> Defines library compilation order
- -map <mapFile> Specifies a library mapping file (multiple -map options supported)
- -cfgfile <confiFile> Specifies a configuration file (multiple -cfgFile options supported)
- -cfg <configName> Specifies a configuration to use (multiple -cfg options supported)
- -Dvar=value Same as env var definition for -f files var substitution
-FLOWS OPTIONS:
- -fileunit Compiles each Verilog file as an independent
- compilation unit (under slpp_unit/ if -writepp used)
- -diffcompunit Compiles both all files as a whole unit and
- separate compilation units to perform diffs
- -parse Parse/Compile/Elaborate the files after pre-processing step
- -nocomp Turns off Compilation & Elaboration
- -noelab Turns off Elaboration
- -pythonlistener Enables the Parser Python Listener
- -pythonlistenerfile <script.py> Specifies the AST python listener file
- -pythonevalscriptperfile <script.py> Eval the Python script on each source file (Multithreaded)
- -pythonevalscript <script.py> Eval the Python script at the design level
- -nopython Turns off all Python features, including waivers
- -strictpythoncheck Turns on strict Python checks
- -mt <nb_max_treads> 0 up to 512 max threads, 0 or 1 being single threaded,
- if "max" is given, the program will use one thread
- per core on the host
- -split <line number> Split files or modules larger than specified line number for multi thread compilation
- -timescale=<timescale> Specifies the overall timescale
- -nobuiltin Do not parse SV builtin classes (array...)
+[FATAL:CM0008] Verilog File "bad" does not exist.
-TRACES OPTIONS:
- -d <int> Debug <level> 1-4, lib, ast, inst, incl
- -nostdout Mutes Standard output
- -verbose Gives verbose processing information
- -profile Gives Profiling information
- -l <file> Specifies log file, default is surelog.log under output dir
+[FATAL:CM0008] Verilog File "command" does not exist.
-OUTPUT OPTIONS:
- -odir <dir> Specifies the output directory, default is ./
- -writeppfile <file> Writes out Preprocessor output in file
- (all compilation units will override this file)
- -writepp Writes out Preprocessor output (all compilation
- units will generate files under slpp_all/ or slpp_unit/)
- -lineoffsetascomments Writes the preprocessor line offsets as comments as opposed as parser directives
- -nocache Default allows to create a cache for include files, this option prevents it
- -cache <dir> Specifies the cache directory, default is slpp_all/cache or slpp_unit/cache
- -createcache Create cache for precompiled packages
- -filterdirectives Filters out simple directives like
- `default_nettype in pre-processor's output
- -filterprotected Filters out protected regions in pre-processor's output
- -filtercomments Filters out comments in pre-processor's output
- -outputlineinfo Outputs SLline directives in pre-processor's output
- -pploc Output message location in terms of post preprocessor location
- -noinfo Filters out INFO messages
- -nonote Filters out NOTE messages
- -nowarning Filters out WARNING messages
- -o <path> Turns on all compilation stages, produces all outputs under that path
-
+[ FATAL] : 2
+[ ERROR] : 0
+[WARNING] : 0
+[ NOTE] : 0
********************************************
* End SURELOG SVerilog Compiler/Linter *
********************************************
-0.10user 0.02system 0:00.13elapsed 94%CPU (0avgtext+0avgdata 40240maxresident)k
-0inputs+16outputs (0major+9591minor)pagefaults 0swaps
+Command exited with non-zero status 1
+0.08user 0.03system 0:00.12elapsed 96%CPU (0avgtext+0avgdata 40036maxresident)k
+0inputs+8outputs (0major+9594minor)pagefaults 0swaps
diff --git a/tests/SimpleCmdLineTest/TestBasic.sl b/tests/SimpleCmdLineTest/TestBasic.sl
index 7c60fab..1256cc7 100644
--- a/tests/SimpleCmdLineTest/TestBasic.sl
+++ b/tests/SimpleCmdLineTest/TestBasic.sl
@@ -1 +1 @@
- -h
+ bad command
diff --git a/tests/SimpleCmdLineTest/TestBasic_diff.log b/tests/SimpleCmdLineTest/TestBasic_diff.log
deleted file mode 100644
index f2bca63..0000000
--- a/tests/SimpleCmdLineTest/TestBasic_diff.log
+++ /dev/null
@@ -1,83 +0,0 @@
-********************************************
-* SURELOG System Verilog Compiler/Linter *
-********************************************
-
- ------------ SURELOG HELP --------------
-
-STANDARD VERILOG COMMAND LINE:
- -f <file> Accepts a file containing command line arguments
- -v <file> Library file
- -y <path> Library directory
- +incdir+<dir>+... Specifies include paths
- -Idir Specifies include paths
- +libext+<extname>+... Specifies the library extensions
- <file>.v Verilog File
- <file>.sv System Verilog File
- +liborder Lib Order option (ignored)
- +librescan Lib Rescan option (ignored)
- +libverbose Lib Verbose option (ignored)
- +nolibcell No Lib Cell option (ignored)
- +define+macro_name=definition+...
- Defines a macro and optionally its value
- -L <libName> Defines library compilation order
- -map <mapFile> Specifies a library mapping file (multiple -map options supported)
- -cfgfile <confiFile> Specifies a configuration file (multiple -cfgFile options supported)
- -cfg <configName> Specifies a configuration to use (multiple -cfg options supported)
- -Dvar=value Same as env var definition for -f files var substitution
-FLOWS OPTIONS:
- -fileunit Compiles each Verilog file as an independent
- compilation unit (under slpp_unit/ if -writepp used)
- -diffcompunit Compiles both all files as a whole unit and
- separate compilation units to perform diffs
- -parse Parse/Compile/Elaborate the files after pre-processing step
- -nocomp Turns off Compilation & Elaboration
- -noelab Turns off Elaboration
- -pythonlistener Enables the Parser Python Listener
- -pythonlistenerfile <script.py> Specifies the AST python listener file
- -pythonevalscriptperfile <script.py> Eval the Python script on each source file (Multithreaded)
- -pythonevalscript <script.py> Eval the Python script at the design level
- -nopython Turns off all Python features, including waivers
- -strictpythoncheck Turns on strict Python checks
- -mt <nb_max_treads> 0 up to 512 max threads, 0 or 1 being single threaded,
- if "max" is given, the program will use one thread
- per core on the host
- -split <line number> Split files or modules larger than specified line number for multi thread compilation
- -timescale=<timescale> Specifies the overall timescale
- -nobuiltin Do not parse SV builtin classes (array...)
-
-TRACES OPTIONS:
- -d <int> Debug <level> 1-4, lib, ast, inst, incl
- -nostdout Mutes Standard output
- -verbose Gives verbose processing information
- -profile Gives Profiling information
- -l <file> Specifies log file, default is surelog.log under output dir
-
-OUTPUT OPTIONS:
- -odir <dir> Specifies the output directory, default is ./
- -writeppfile <file> Writes out Preprocessor output in file
- (all compilation units will override this file)
- -writepp Writes out Preprocessor output (all compilation
- units will generate files under slpp_all/ or slpp_unit/)
- -lineoffsetascomments Writes the preprocessor line offsets as comments as opposed as parser directives
- -nocache Default allows to create a cache for include files, this option prevents it
- -cache <dir> Specifies the cache directory, default is slpp_all/cache or slpp_unit/cache
- -createcache Create cache for precompiled packages
- -filterdirectives Filters out simple directives like
- `default_nettype in pre-processor's output
- -filterprotected Filters out protected regions in pre-processor's output
- -filtercomments Filters out comments in pre-processor's output
- -outputlineinfo Outputs SLline directives in pre-processor's output
- -pploc Output message location in terms of post preprocessor location
- -noinfo Filters out INFO messages
- -nonote Filters out NOTE messages
- -nowarning Filters out WARNING messages
- -o <path> Turns on all compilation stages, produces all outputs under that path
-
-
-********************************************
-* End SURELOG SVerilog Compiler/Linter *
-********************************************
-
-0.10user 0.01system 0:00.12elapsed 96%CPU (0avgtext+0avgdata 40204maxresident)k
-0inputs+16outputs (0major+9620minor)pagefaults 0swaps
-sh: 2: -mt: not found
diff --git a/tests/SimpleCmdLineTest/cmd b/tests/SimpleCmdLineTest/cmd
deleted file mode 100644
index 32db30b..0000000
--- a/tests/SimpleCmdLineTest/cmd
+++ /dev/null
@@ -1 +0,0 @@
-top.v -f flist.f -y . +libverbose -h
diff --git a/tests/SimpleCmdLineTest/surelog.log b/tests/SimpleCmdLineTest/surelog.log
deleted file mode 100644
index 7bec2a3..0000000
--- a/tests/SimpleCmdLineTest/surelog.log
+++ /dev/null
@@ -1,88 +0,0 @@
-********************************************
-* SURELOG System Verilog Compiler/Linter *
-********************************************
-
-Copyright (c) 2017-2019 Alain Dargelas,
-http://www.apache.org/licenses/LICENSE-2.0
-
-VERSION: 1.00
-BUILT : Nov 15 2019
-DATE : 2019-11-16.08:32:25
-COMMAND: -h -mt 0 -o ../../build/tests/TestBasic/
-
- ------------ SURELOG HELP --------------
-
-STANDARD VERILOG COMMAND LINE:
- -f <file> Accepts a file containing command line arguments
- -v <file> Library file
- -y <path> Library directory
- +incdir+<dir>+... Specifies include paths
- -Idir Specifies include paths
- +libext+<extname>+... Specifies the library extensions
- <file>.v Verilog File
- <file>.sv System Verilog File
- +liborder Lib Order option (ignored)
- +librescan Lib Rescan option (ignored)
- +libverbose Lib Verbose option (ignored)
- +nolibcell No Lib Cell option (ignored)
- +define+macro_name=definition+...
- Defines a macro and optionally its value
- -L <libName> Defines library compilation order
- -map <mapFile> Specifies a library mapping file (multiple -map options supported)
- -cfgfile <confiFile> Specifies a configuration file (multiple -cfgFile options supported)
- -cfg <configName> Specifies a configuration to use (multiple -cfg options supported)
- -Dvar=value Same as env var definition for -f files var substitution
-FLOWS OPTIONS:
- -fileunit Compiles each Verilog file as an independent
- compilation unit (under slpp_unit/ if -writepp used)
- -diffcompunit Compiles both all files as a whole unit and
- separate compilation units to perform diffs
- -parse Parse/Compile/Elaborate the files after pre-processing step
- -nocomp Turns off Compilation & Elaboration
- -noelab Turns off Elaboration
- -pythonlistener Enables the Parser Python Listener
- -pythonlistenerfile <script.py> Specifies the AST python listener file
- -pythonevalscriptperfile <script.py> Eval the Python script on each source file (Multithreaded)
- -pythonevalscript <script.py> Eval the Python script at the design level
- -nopython Turns off all Python features, including waivers
- -strictpythoncheck Turns on strict Python checks
- -mt <nb_max_treads> 0 up to 512 max threads, 0 or 1 being single threaded,
- if "max" is given, the program will use one thread
- per core on the host
- -split <line number> Split files or modules larger than specified line number for multi thread compilation
- -timescale=<timescale> Specifies the overall timescale
- -nobuiltin Do not parse SV builtin classes (array...)
-
-TRACES OPTIONS:
- -d <int> Debug <level> 1-4, lib, ast, inst, incl
- -nostdout Mutes Standard output
- -verbose Gives verbose processing information
- -profile Gives Profiling information
- -l <file> Specifies log file, default is surelog.log under output dir
-
-OUTPUT OPTIONS:
- -odir <dir> Specifies the output directory, default is ./
- -writeppfile <file> Writes out Preprocessor output in file
- (all compilation units will override this file)
- -writepp Writes out Preprocessor output (all compilation
- units will generate files under slpp_all/ or slpp_unit/)
- -lineoffsetascomments Writes the preprocessor line offsets as comments as opposed as parser directives
- -nocache Default allows to create a cache for include files, this option prevents it
- -cache <dir> Specifies the cache directory, default is slpp_all/cache or slpp_unit/cache
- -createcache Create cache for precompiled packages
- -filterdirectives Filters out simple directives like
- `default_nettype in pre-processor's output
- -filterprotected Filters out protected regions in pre-processor's output
- -filtercomments Filters out comments in pre-processor's output
- -outputlineinfo Outputs SLline directives in pre-processor's output
- -pploc Output message location in terms of post preprocessor location
- -noinfo Filters out INFO messages
- -nonote Filters out NOTE messages
- -nowarning Filters out WARNING messages
- -o <path> Turns on all compilation stages, produces all outputs under that path
-
-
-********************************************
-* End SURELOG SVerilog Compiler/Linter *
-********************************************
-
diff --git a/tests/SimpleIncludeAndMacros/cmd b/tests/SimpleIncludeAndMacros/cmd
deleted file mode 100644
index b6abe38..0000000
--- a/tests/SimpleIncludeAndMacros/cmd
+++ /dev/null
@@ -1 +0,0 @@
-top.v
diff --git a/tests/TestMacros/cmd b/tests/TestMacros/cmd
deleted file mode 100644
index b9b271f..0000000
--- a/tests/TestMacros/cmd
+++ /dev/null
@@ -1 +0,0 @@
-TestMacros.v macros.v xl.v
