Loading CMakeLists.txt +6 −11 Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ # Licensed under the MIT license (see LICENSE). cmake_minimum_required(VERSION 2.6) project(fnordmetric) enable_testing() set(FNORDMETRIC_SOURCES src/util/format.cc Loading Loading @@ -48,24 +47,20 @@ set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++") add_definitions("-Wno-predefined-identifier-outside-function") # add_library(fnordmetric SHARED ${FNORDMETRIC_SOURCES}) add_test(QueryTest test/test-query) add_executable(test/test-query add_executable(tests/test-query ${FNORDMETRIC_QUERY_SOURCES} src/query/query_test.cc) add_test(UITest test/test-ui) add_executable(test/test-ui ${FNORDMETRIC_UI_SOURCES} src/ui/ui_test.cc) # add_executable(tests/test-ui # ${FNORDMETRIC_UI_SOURCES} # src/ui/ui_test.cc) add_test(InputStreamTest test/test-input-stream) add_executable(test/test-input-stream add_executable(tests/test-input-stream ${FNORDMETRIC_SOURCES} ${FNORDMETRIC_CSV_BACKEND_SOURCES} src/util/inputstream_test.cc) add_test(CSVBackendTest test/test-csv-backend) add_executable(test/test-csv-backend add_executable(tests/test-csv-backend ${FNORDMETRIC_UI_SOURCES} ${FNORDMETRIC_CSV_BACKEND_SOURCES} src/backends/csv/csvbackend_test.cc) Makefile 0 → 100644 +27 −0 Original line number Diff line number Diff line # This file is part of the "FnordMetric" project # Copyright (c) 2014 Paul Asmuth, Google Inc. # # Licensed under the MIT license (see LICENSE). all: mkdir -p build/tests (cd build && cmake .. && make) test: all @find build/tests -iname "test-*" | while read t; do $$t || exit 1; done clean: rm -rf build/* find . \ -name 'CMakeCache.txt' -o \ -name 'CMakeFiles' -o \ -name cmake_install.cmake -o \ -name '*.so' -o \ -name '*.dylib' -o \ -name '*.bundle' -o \ -name '*.dll' -o \ -name '*.a' | \ xargs rm -rf .PHONY: all test clean autogen.sh +2 −16 Original line number Diff line number Diff line #!/bin/bash if [[ "$1" == "clean" ]]; then rm -rf build/* find . \ -name 'CMakeCache.txt' -o \ -name 'CMakeFiles' -o \ -name 'Makefile' -o \ -name cmake_install.cmake -o \ -name '*.so' -o \ -name '*.dylib' -o \ -name '*.bundle' -o \ -name '*.dll' -o \ -name '*.a' | \ xargs rm -rf make clean exit 0 fi mkdir -p build/test cd build && cmake .. && make make build src/query/query_test.cc +2 −2 Original line number Diff line number Diff line Loading @@ -880,7 +880,7 @@ public: query.execute(); auto chart = query.getChart(0); chart->renderSVG(); //chart->renderSVG(); } void testDerivedSeriesDrawQuery() { Loading @@ -903,7 +903,7 @@ public: query.execute(); auto chart = query.getChart(0); chart->renderSVG(); //chart->renderSVG(); } }; Loading Loading
CMakeLists.txt +6 −11 Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ # Licensed under the MIT license (see LICENSE). cmake_minimum_required(VERSION 2.6) project(fnordmetric) enable_testing() set(FNORDMETRIC_SOURCES src/util/format.cc Loading Loading @@ -48,24 +47,20 @@ set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++") add_definitions("-Wno-predefined-identifier-outside-function") # add_library(fnordmetric SHARED ${FNORDMETRIC_SOURCES}) add_test(QueryTest test/test-query) add_executable(test/test-query add_executable(tests/test-query ${FNORDMETRIC_QUERY_SOURCES} src/query/query_test.cc) add_test(UITest test/test-ui) add_executable(test/test-ui ${FNORDMETRIC_UI_SOURCES} src/ui/ui_test.cc) # add_executable(tests/test-ui # ${FNORDMETRIC_UI_SOURCES} # src/ui/ui_test.cc) add_test(InputStreamTest test/test-input-stream) add_executable(test/test-input-stream add_executable(tests/test-input-stream ${FNORDMETRIC_SOURCES} ${FNORDMETRIC_CSV_BACKEND_SOURCES} src/util/inputstream_test.cc) add_test(CSVBackendTest test/test-csv-backend) add_executable(test/test-csv-backend add_executable(tests/test-csv-backend ${FNORDMETRIC_UI_SOURCES} ${FNORDMETRIC_CSV_BACKEND_SOURCES} src/backends/csv/csvbackend_test.cc)
Makefile 0 → 100644 +27 −0 Original line number Diff line number Diff line # This file is part of the "FnordMetric" project # Copyright (c) 2014 Paul Asmuth, Google Inc. # # Licensed under the MIT license (see LICENSE). all: mkdir -p build/tests (cd build && cmake .. && make) test: all @find build/tests -iname "test-*" | while read t; do $$t || exit 1; done clean: rm -rf build/* find . \ -name 'CMakeCache.txt' -o \ -name 'CMakeFiles' -o \ -name cmake_install.cmake -o \ -name '*.so' -o \ -name '*.dylib' -o \ -name '*.bundle' -o \ -name '*.dll' -o \ -name '*.a' | \ xargs rm -rf .PHONY: all test clean
autogen.sh +2 −16 Original line number Diff line number Diff line #!/bin/bash if [[ "$1" == "clean" ]]; then rm -rf build/* find . \ -name 'CMakeCache.txt' -o \ -name 'CMakeFiles' -o \ -name 'Makefile' -o \ -name cmake_install.cmake -o \ -name '*.so' -o \ -name '*.dylib' -o \ -name '*.bundle' -o \ -name '*.dll' -o \ -name '*.a' | \ xargs rm -rf make clean exit 0 fi mkdir -p build/test cd build && cmake .. && make make build
src/query/query_test.cc +2 −2 Original line number Diff line number Diff line Loading @@ -880,7 +880,7 @@ public: query.execute(); auto chart = query.getChart(0); chart->renderSVG(); //chart->renderSVG(); } void testDerivedSeriesDrawQuery() { Loading @@ -903,7 +903,7 @@ public: query.execute(); auto chart = query.getChart(0); chart->renderSVG(); //chart->renderSVG(); } }; Loading
