scons: put targets in global SConscript (commaai#1180)

* Revert "remove unused scons argument (commaai#1169)" This reverts commit 702e528. * try this * clean up * default true * default true * already built
budney · Dec 1, 2022 · 2ae7b9a · 2ae7b9a
1 parent a0b1d64
commit 2ae7b9a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/SConscript b/SConscript
@@ -0,0 +1,6 @@
+# panda fw
+SConscript('board/SConscript')
+
+# test files
+if GetOption('test'):
+  SConscript('tests/libpanda/SConscript')
diff --git a/SConstruct b/SConstruct
@@ -1,5 +1,7 @@
-# panda fw
-SConscript('board/SConscript')
+AddOption('--test',
+          action='store_true',
+          default=True,
+          help='build test files')
 
-# test files
-SConscript('tests/libpanda/SConscript')
+# panda fw & test files
+SConscript('SConscript')
diff --git a/tests/libpanda/SConscript b/tests/libpanda/SConscript
@@ -5,7 +5,7 @@ env = Environment(
     '-fno-builtin',
     '-std=gnu11',
   ],
-  CPPPATH=[".", "#board/"],
+  CPPPATH=[".", "../../board"],
 )
 
 env.SharedLibrary("libpanda.so", ["safety_helpers.c"])
diff --git a/tests/safety/SConscript b/tests/safety/SConscript