From a94f4fb98920f3832ba47cae8a12131bba39d2f2 Mon Sep 17 00:00:00 2001
From: Samuel Sadok <samuel.sadok@bluewin.ch>
Date: Mon, 14 May 2018 13:35:35 -0700
Subject: [PATCH] dont run Fibre tup rules by default Building the Fibre test
 binaries is distracting when it's just used as a library in another project.
 Now it is only built if CONFIG_BUILD_FIBRE_TESTS=true

---
 Firmware/fibre/cpp/{Tupfile.lua => package.lua} |  0
 Firmware/fibre/{ => test}/Tupfile.lua           | 16 ++++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename Firmware/fibre/cpp/{Tupfile.lua => package.lua} (100%)
 rename Firmware/fibre/{ => test}/Tupfile.lua (71%)

diff --git a/Firmware/fibre/cpp/Tupfile.lua b/Firmware/fibre/cpp/package.lua
similarity index 100%
rename from Firmware/fibre/cpp/Tupfile.lua
rename to Firmware/fibre/cpp/package.lua
diff --git a/Firmware/fibre/Tupfile.lua b/Firmware/fibre/test/Tupfile.lua
similarity index 71%
rename from Firmware/fibre/Tupfile.lua
rename to Firmware/fibre/test/Tupfile.lua
index 26046302..3a4dbcf1 100644
--- a/Firmware/fibre/Tupfile.lua
+++ b/Firmware/fibre/test/Tupfile.lua
@@ -1,15 +1,16 @@
 
-tup.include('tupfiles/build.lua')
-tup.include('cpp/Tupfile.lua')
+
+tup.include('../tupfiles/build.lua')
+tup.include('../cpp/package.lua')
 
 test_server = define_package{
     packages={fibre_package},
-    sources={'test/test_server.cpp'}
+    sources={'test_server.cpp'}
 }
 
 unit_tests = define_package{
     packages={fibre_package},
-    sources={'test/run_tests.cpp'}
+    sources={'run_tests.cpp'}
 }
 
 
@@ -19,5 +20,8 @@ toolchain=GCCToolchain('', 'build', {'-O3', '-g', '-Wall'}, {})
 --toolchain=LLVMToolchain('x86_64', {'-O3', '-fno-sanitize=safe-stack', '-fno-stack-protector'}, {'-flto', '-Wl,-s'})
 --toolchain=LLVMToolchain('avr', {'-O3', '-std=gnu++11', '--target=avr', '-fno-sanitize=safe-stack', '-fno-stack-protector', '-I/home/samuel/stlport-avr/stlport'}, {'-flto', '-Wl,-s'})
 
-build_executable('test_server', test_server, toolchain)
---build_executable('run_tests', unit_tests, toolchain)
+
+if tup.getconfig("BUILD_FIBRE_TESTS") == "true" then
+	build_executable('test_server', test_server, toolchain)
+	--build_executable('run_tests', unit_tests, toolchain)
+end