diff options
| -rw-r--r-- | .nix/derivation.nix | 4 | ||||
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | c++/descriptor.hpp (renamed from c++/descriptor.h) | 0 | ||||
| -rw-r--r-- | c++/examples/cavity_2d.cpp | 2 | ||||
| -rw-r--r-- | tests/SConscript | 32 | ||||
| -rw-r--r-- | tests/equilibrium.cpp | 3 |
6 files changed, 40 insertions, 2 deletions
diff --git a/.nix/derivation.nix b/.nix/derivation.nix index b328e56..7dc7c7f 100644 --- a/.nix/derivation.nix +++ b/.nix/derivation.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { forstio.async forstio.codec forstio.codec-unit - ]; + ]; + + doCheck = true; outputs = [ "out" "dev" ]; } @@ -58,6 +58,7 @@ env.targets = []; Export('env') SConscript('c++/SConscript') +SConscript('tests/SConscript') env.Alias('cdb', env.cdb); env.Alias('all', [env.targets]); diff --git a/c++/descriptor.h b/c++/descriptor.hpp index 8c0036a..8c0036a 100644 --- a/c++/descriptor.h +++ b/c++/descriptor.hpp diff --git a/c++/examples/cavity_2d.cpp b/c++/examples/cavity_2d.cpp index 82cdd0c..9e91c6c 100644 --- a/c++/examples/cavity_2d.cpp +++ b/c++/examples/cavity_2d.cpp @@ -1,4 +1,4 @@ -#include "../descriptor.h" +#include "../descriptor.hpp" /** */ diff --git a/tests/SConscript b/tests/SConscript new file mode 100644 index 0000000..d1b381e --- /dev/null +++ b/tests/SConscript @@ -0,0 +1,32 @@ +#!/bin/false + +import os +import os.path +import glob + + +Import('env') + +dir_path = Dir('.').abspath + +# Environment for base library +test_cases_env = env.Clone(); + +test_cases_env.Append(LIBS=['forstio-test']); + +test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp")) +test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp")) + +env.sources += test_cases_env.sources; +env.headers += test_cases_env.headers; + +objects_static = [] +test_cases_env.add_source_files(objects_static, test_cases_env.sources, shared=False); +test_cases_env.program = test_cases_env.Program('#bin/tests', [objects_static]); +# , env.library_static]); + +# Set Alias +env.Alias('test', test_cases_env.program); +env.Alias('check', test_cases_env.program); + +env.targets += ['test','check']; diff --git a/tests/equilibrium.cpp b/tests/equilibrium.cpp new file mode 100644 index 0000000..8d53125 --- /dev/null +++ b/tests/equilibrium.cpp @@ -0,0 +1,3 @@ +#include <forstio/test/suite.hpp> + +#include "../c++/descriptor.hpp" |