Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7763059
commit 3002228
Showing
5 changed files
with
35 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,40 @@ | ||
These 4 tests fail with error: | ||
std::runtime_error: locale::facet::_S_create_c_locale name not valid | ||
|
||
diff --git testsuite/Makefile.am testsuite/Makefile.am | ||
index d7e30b8..001f834 100644 | ||
index ccb84d3..9774a9c 100644 | ||
--- testsuite/Makefile.am | ||
+++ testsuite/Makefile.am | ||
@@ -7,8 +7,8 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) | ||
@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) | ||
LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework | ||
|
||
check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \ | ||
- equal-date.test dbus-escape.test cmp-lt.test humanstring.test \ | ||
- equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test \ | ||
- table.test table-formatter.test csv-formatter.test json-formatter.test \ | ||
+ equal-date.test dbus-escape.test \ | ||
- getopts.test scan-datetime.test root-prefix.test range.test limit.test | ||
+ equal-date.test dbus-escape.test uuid.test \ | ||
+ csv-formatter.test json-formatter.test \ | ||
getopts.test | ||
+ getopts.test scan-datetime.test root-prefix.test | ||
|
||
if ENABLE_BTRFS_QUOTA | ||
@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt | ||
check_PROGRAMS += qgroup1.test | ||
@@ -29,14 +29,8 @@ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
|
||
equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
|
||
-humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
- | ||
uuid_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
|
||
-table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
- | ||
-table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
- | ||
csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
|
||
json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS) | ||
@@ -44,7 +38,3 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils | ||
getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
|
||
lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la | ||
- | ||
-range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la | ||
- | ||
-limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la |
164 changes: 0 additions & 164 deletions
164
srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git client/cleanup.cc client/cleanup.cc | ||
index 801c0f5..e57a0a8 100644 | ||
--- client/cleanup.cc | ||
+++ client/cleanup.cc | ||
@@ -51,7 +51,7 @@ struct Parameters | ||
MinFreeLimit free_limit; | ||
|
||
|
||
- void read(const ProxyConfig& config, const char* name, long int& value) | ||
+ void read(const ProxyConfig& config, const char* name, time_t& value) | ||
{ | ||
const map<string, string>& raw = config.getAllValues(); | ||
map<string, string>::const_iterator pos = raw.find(name); |
19 changes: 0 additions & 19 deletions
19
srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters