Commit f9523a12 authored by Rene Engelhard's avatar Rene Engelhard Committed by Rene Engelhard

Import Debian changes 1.1.0+dfsg-1

rapidjson (1.1.0+dfsg-1) experimental; urgency=medium

  * remove bin/jsonchecker/* (closes: #840333) and disable the unit test
    using it
  * don't bogusly install usr/lib/libgtest*.a
parents c4873c25 be4be1f4
rapidjson (1.1.0+dfsg-1) experimental; urgency=medium
* remove bin/jsonchecker/* (closes: #840333) and disable the unit test
using it
* don't bogusly install usr/lib/libgtest*.a
-- Rene Engelhard <rene@debian.org> Wed, 30 Nov 2016 22:42:45 +0100
rapidjson (1.1.0-1) experimental; urgency=medium
* New upstream release
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: rapidjson
Source: https://github.com/miloyip/rapidjson
Files-Excluded: bin/jsonchecker/*
Files: *
Copyright: Copyright (C) 2011-2014 Milo Yip
......
Description: remove the unittest using bin/jsonchecker/*
as that one is removed from the tarball due to having this insane
'good not evil' "license
Author: Rene Engelhard <rene@debian.org>
Bug-Debian: https://bugs.debian.org/840333
--- rapidjson-0.12~git20141031+dfsg.orig/test/unittest/jsoncheckertest.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/document.h"
-
-using namespace rapidjson;
-
-static char* ReadFile(const char* filename, size_t& length) {
- const char *paths[] = {
- "jsonchecker",
- "bin/jsonchecker",
- "../bin/jsonchecker",
- "../../bin/jsonchecker",
- "../../../bin/jsonchecker"
- };
- char buffer[1024];
- FILE *fp = 0;
- for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
- sprintf(buffer, "%s/%s", paths[i], filename);
- fp = fopen(buffer, "rb");
- if (fp)
- break;
- }
-
- if (!fp)
- return 0;
-
- fseek(fp, 0, SEEK_END);
- length = static_cast<size_t>(ftell(fp));
- fseek(fp, 0, SEEK_SET);
- char* json = static_cast<char*>(malloc(length + 1));
- size_t readLength = fread(json, 1, length, fp);
- json[readLength] = '\0';
- fclose(fp);
- return json;
-}
-
-TEST(JsonChecker, Reader) {
- char filename[256];
-
- // jsonchecker/failXX.json
- for (int i = 1; i <= 33; i++) {
- if (i == 1) // fail1.json is valid in rapidjson, which has no limitation on type of root element (RFC 7159).
- continue;
- if (i == 18) // fail18.json is valid in rapidjson, which has no limitation on depth of nesting.
- continue;
-
- sprintf(filename, "fail%d.json", i);
- size_t length;
- char* json = ReadFile(filename, length);
- if (!json) {
- printf("jsonchecker file %s not found", filename);
- ADD_FAILURE();
- continue;
- }
-
- GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
- document.Parse(json);
- EXPECT_TRUE(document.HasParseError());
-
- document.Parse<kParseIterativeFlag>(json);
- EXPECT_TRUE(document.HasParseError());
-
- free(json);
- }
-
- // passX.json
- for (int i = 1; i <= 3; i++) {
- sprintf(filename, "pass%d.json", i);
- size_t length;
- char* json = ReadFile(filename, length);
- if (!json) {
- printf("jsonchecker file %s not found", filename);
- continue;
- }
-
- GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
- document.Parse(json);
- EXPECT_FALSE(document.HasParseError());
-
- document.Parse<kParseIterativeFlag>(json);
- EXPECT_FALSE(document.HasParseError());
-
- free(json);
- }
-}
--- rapidjson-1.1.0+dfsg.orig/test/unittest/CMakeLists.txt
+++ rapidjson-1.1.0+dfsg/test/unittest/CMakeLists.txt
@@ -11,7 +11,6 @@ set(UNITTEST_SOURCES
filestreamtest.cpp
itoatest.cpp
istreamwrappertest.cpp
- jsoncheckertest.cpp
namespacetest.cpp
pointertest.cpp
prettywritertest.cpp
disable-valgrind_unittest.diff
no-jsoncheckertest.diff
usr/lib
usr/lib/cmake
usr/lib/pkgconfig
usr/include
build/CMakeFiles/3.7.0/CMakeDetermineCompilerABI_C.bin
build/CMakeFiles/3.7.0/CMakeDetermineCompilerABI_CXX.bin
build/CMakeFiles/3.7.0/CompilerIdC/a.out
build/CMakeFiles/3.7.0/CompilerIdCXX/a.out
build/CMakeFiles/feature_tests.bin
version=3
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/rapidjson-$1\.tar\.gz/ \
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/rapidjson-$1\.tar\.gz/,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$// \
https://github.com/miloyip/rapidjson/tags .*/v?(\d\S*)\.tar\.gz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment