Adapt tageditor tests to jq update
This commit is contained in:
parent
cb48d7af1f
commit
64594521f0
|
@ -0,0 +1 @@
|
||||||
|
../default/0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
|
|
@ -23,8 +23,15 @@ provides=("${pkgname%-cli}")
|
||||||
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
|
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
|
||||||
checkdepends=('cppunit')
|
checkdepends=('cppunit')
|
||||||
url="https://github.com/Martchus/${_reponame}"
|
url="https://github.com/Martchus/${_reponame}"
|
||||||
source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
|
source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
|
||||||
sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b')
|
0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch)
|
||||||
|
sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b'
|
||||||
|
SKIP)
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
||||||
|
patch -p1 -i ../0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
|
||||||
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
From e1e979f9f5df83cd705ff6e47e75f71905e58495 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martchus <martchus@gmx.net>
|
||||||
|
Date: Fri, 29 Dec 2023 17:58:43 +0100
|
||||||
|
Subject: [PATCH] Avoid use of `jq`-argument `--argjson` as it has been removed
|
||||||
|
|
||||||
|
Apprently `--slurpfile` is supposed to be used instead.
|
||||||
|
---
|
||||||
|
tests/cli.cpp | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/cli.cpp b/tests/cli.cpp
|
||||||
|
index 123d485..7e5a2cb 100644
|
||||||
|
--- a/tests/cli.cpp
|
||||||
|
+++ b/tests/cli.cpp
|
||||||
|
@@ -1164,12 +1164,12 @@ void CliTests::testJsonExport()
|
||||||
|
cout << "\nJSON export" << endl;
|
||||||
|
string stdout, stderr;
|
||||||
|
|
||||||
|
- const auto file(testFilePath("matroska_wave1/test3.mkv"));
|
||||||
|
- const auto expectedJsonPath(testFilePath("matroska_wave1-test3.json"));
|
||||||
|
+ const auto file = testFilePath("matroska_wave1/test3.mkv");
|
||||||
|
+ const auto expectedJson = readFile(testFilePath("matroska_wave1-test3.json"));
|
||||||
|
const char *const args[] = { "tageditor", "export", "--pretty", "-f", file.data(), nullptr };
|
||||||
|
TESTUTILS_ASSERT_EXEC(args);
|
||||||
|
const char *const jqArgs[]
|
||||||
|
- = { "jq", "--argfile", "expected", expectedJsonPath.data(), "--argjson", "actual", stdout.data(), "-n", "$actual == $expected", nullptr };
|
||||||
|
+ = { "jq", "--argjson", "expected", expectedJson.data(), "--argjson", "actual", stdout.data(), "-n", "$actual == $expected", nullptr };
|
||||||
|
const auto *const logJsonExport = std::getenv(PROJECT_VARNAME_UPPER "_LOG_JQ_INVOCATION");
|
||||||
|
execHelperAppInSearchPath("jq", jqArgs, stdout, stderr, !logJsonExport || !std::strlen(logJsonExport));
|
||||||
|
CPPUNIT_ASSERT_EQUAL(""s, stderr);
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
|
@ -29,8 +29,15 @@ makedepends=('cmake' 'ninja' 'qt5-tools')
|
||||||
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
|
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
|
||||||
checkdepends=('cppunit' 'jq')
|
checkdepends=('cppunit' 'jq')
|
||||||
url="https://github.com/Martchus/${_reponame}"
|
url="https://github.com/Martchus/${_reponame}"
|
||||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
|
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
|
||||||
sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b')
|
0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch)
|
||||||
|
sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b'
|
||||||
|
SKIP)
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
||||||
|
patch -p1 -i ../0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
|
||||||
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
../default/0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
|
|
@ -31,8 +31,15 @@ makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang')
|
||||||
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
|
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
|
||||||
checkdepends=('cppunit' 'jq')
|
checkdepends=('cppunit' 'jq')
|
||||||
url="https://github.com/Martchus/${_reponame}"
|
url="https://github.com/Martchus/${_reponame}"
|
||||||
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
|
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
|
||||||
sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b')
|
0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch)
|
||||||
|
sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b'
|
||||||
|
SKIP)
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
||||||
|
patch -p1 -i ../0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
|
||||||
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
|
||||||
|
|
Loading…
Reference in New Issue