From 7075c3648aa125e21118a3e7aa38594d03bfb296 Mon Sep 17 00:00:00 2001 From: iphydf Date: Fri, 19 Aug 2016 19:31:08 +0100 Subject: [PATCH] Add cmake test for apidsl. --- CMakeLists.txt | 3 +++ other/astyle/format-source | 26 ++++++++++++++++++++++++++ other/travis/toxcore-script | 3 --- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25c8ed15..9061286d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,9 @@ target_link_libraries(toxencryptsave toxcore) # ################################################################################ +add_test(format_test + ${CMAKE_SOURCE_DIR}/other/astyle/format-source "${CMAKE_SOURCE_DIR}") + function(auto_test target) if(CHECK_FOUND) add_executable(auto_${target} auto_tests/${target}.c) diff --git a/other/astyle/format-source b/other/astyle/format-source index 9571fd7b..fc81f744 100755 --- a/other/astyle/format-source +++ b/other/astyle/format-source @@ -1,9 +1,35 @@ #!/bin/sh +set -e + +SOURCE_DIR="$1" + +# Go to the source root. +if [ -z "$SOURCE_DIR" ]; then + SOURCE_DIR=. +fi +cd "$SOURCE_DIR" + if [ -z "$ASTYLE" ]; then ASTYLE=astyle fi +if [ -f ../apidsl/_build/apigen.native ]; then + APIDSL=../apidsl/_build/apigen.native +else + APIDSL=apidsl_curl +fi + +apidsl_curl() { + curl -X POST --data-binary @"$1" https://apidsl.herokuapp.com/apidsl +} + +# Check if toxcore.h and toxav.h match apidsl tox.in.h and toxav.in.h. +$APIDSL other/apidsl/tox.in.h > toxcore/tox.h +$APIDSL other/apidsl/toxav.in.h > toxav/toxav.h + SOURCES=`find . -name "*.[ch]" -and -not -name "*.in.*" -and -not -wholename "*crypto_pwhash*" -and -not -wholename "./super_donators/*"` $ASTYLE -n --options=other/astyle/astylerc $SOURCES + +git diff --exit-code diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script index 6cf544ed..59168b40 100755 --- a/other/travis/toxcore-script +++ b/other/travis/toxcore-script @@ -3,9 +3,6 @@ set -e -u -x . other/travis/env-$ENV.sh -# Check if toxcore.h and toxav.h match apidsl tox.in.h and toxav.in.h. -../apidsl/_build/apigen.native other/apidsl/tox.in.h > toxcore/tox.h -../apidsl/_build/apigen.native other/apidsl/toxav.in.h > toxav/toxav.h # Check if the code is formatted according to the astyle configuration. other/astyle/format-source git diff --exit-code