data-tests (WIP)more_tests

1 files changed, 8 insertions, 7 deletions

diff --git a/salis.py b/salis.py
index de4f75d..ba17643 100755
--- a/salis.py
+++ b/salis.py
@@ -220,7 +220,7 @@ ns = SimpleNamespace()
 
 def gen_sim_paths():
     ns.sim_dir = os.path.join(args.home, args.name)
-    ns.sim_edir = os.path.join(ns.sim_dir, "evas")
+    ns.sim_evas = os.path.join(ns.sim_dir, "evas")
     ns.sim_opts = os.path.join(ns.sim_dir, "opts.json")
     ns.sim_path = os.path.join(ns.sim_dir, args.name)
 
@@ -262,10 +262,10 @@ if args.command == "new":
         log.info(f"Using random seed: {hex(args.seed)}")
 
     log.info(f"Creating new simulation directory at: {ns.sim_dir}")
-    log.info(f"Creating new event-array storage directory at: {ns.sim_edir}")
+    log.info(f"Creating new event-array storage directory at: {ns.sim_evas}")
     log.info(f"Creating configuration file at: {ns.sim_opts}")
     os.mkdir(ns.sim_dir)
-    os.mkdir(ns.sim_edir)
+    os.mkdir(ns.sim_evas)
 
     opts = {fmt_h2u(name[1]): getattr(args, fmt_h2u(name[1])) for (name, sub_parsers, _), kwargs in options.items() if new in sub_parsers and load not in sub_parsers}
 
@@ -369,7 +369,8 @@ def pop_data_push_vars():
     ns.b.links.add("-lz")
 
 def pop_sim_path_vars():
-    ns.b.defines.add(f"-DSIM_EDIR=\"{ns.sim_edir}\"")
+    ns.b.defines.add(f"-DSIM_DIR=\"{ns.sim_dir}\"")
+    ns.b.defines.add(f"-DSIM_EVAS=\"{ns.sim_evas}\"")
     ns.b.defines.add(f"-DSIM_OPTS=\"{ns.sim_opts}\"")
     ns.b.defines.add(f"-DSIM_PATH=\"{ns.sim_path}\"")
 
@@ -420,7 +421,7 @@ if args.command == "new":
     pop_general()
 
     ns.b.defines.add(f"-DAUTOSAVE_NAME_LEN={len(ns.sim_path) + 18}")
-    ns.b.defines.add(f"-DEVA_SAVE_NAME_LEN={len(ns.sim_edir) + 23}")
+    ns.b.defines.add(f"-DEVA_SAVE_NAME_LEN={len(ns.sim_evas) + 23}")
     ns.b.defines.add(f"-DTHREAD_GAP={args.thread_gap}")
 
 # Populate for load
@@ -432,7 +433,7 @@ if args.command == "load":
     pop_general()
 
     ns.b.defines.add(f"-DAUTOSAVE_NAME_LEN={len(ns.sim_path) + 18}")
-    ns.b.defines.add(f"-DEVA_SAVE_NAME_LEN={len(ns.sim_edir) + 23}")
+    ns.b.defines.add(f"-DEVA_SAVE_NAME_LEN={len(ns.sim_evas) + 23}")
     ns.b.defines.add(f"-DTHREAD_GAP={args.thread_gap}")
 
 # Populate for server
@@ -443,7 +444,7 @@ if args.command == "server":
     pop_net_vars()
     pop_general()
 
-    ns.b.defines.add(f"-DEVA_SAVE_NAME_LEN={len(ns.sim_edir) + 23}")
+    ns.b.defines.add(f"-DEVA_SAVE_NAME_LEN={len(ns.sim_evas) + 23}")
 
 # Populate for client
 if args.command == "client":