chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-pppoe: spelling
[elogind.git]
/
src
/
test
/
test-install.c
diff --git
a/src/test/test-install.c
b/src/test/test-install.c
index 709974f9e5ff9e0f67b54e1a760e7e4f16c723bf..467970b0075729228ba3b71bf969dc4813b7ef62 100644
(file)
--- a/
src/test/test-install.c
+++ b/
src/test/test-install.c
@@
-25,12
+25,13
@@
#include <fcntl.h>
#include "util.h"
#include <fcntl.h>
#include "util.h"
+#include "path-util.h"
#include "install.h"
static void dump_changes(UnitFileChange *c, unsigned n) {
unsigned i;
#include "install.h"
static void dump_changes(UnitFileChange *c, unsigned n) {
unsigned i;
- assert(n == 0 || c);
+ assert
_se
(n == 0 || c);
for (i = 0; i < n; i++) {
if (c[i].type == UNIT_FILE_UNLINK)
for (i = 0; i < n; i++) {
if (c[i].type == UNIT_FILE_UNLINK)
@@
-50,14
+51,14
@@
int main(int argc, char* argv[]) {
UnitFileChange *changes = NULL;
unsigned n_changes = 0;
UnitFileChange *changes = NULL;
unsigned n_changes = 0;
- h = hashmap_new(
string_hash_func, string_compare_func
);
+ h = hashmap_new(
&string_hash_ops
);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
assert_se(r == 0);
HASHMAP_FOREACH(p, h, i) {
UnitFileState s;
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
assert_se(r == 0);
HASHMAP_FOREACH(p, h, i) {
UnitFileState s;
- s = unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(p->path));
+ s = unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(p->path));
assert_se(p->state == s);
assert_se(p->state == s);
@@
-175,7
+176,7
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == UNIT_FILE_ENABLED);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == UNIT_FILE_ENABLED);
log_error("disable files2");
changes = NULL;
log_error("disable files2");
changes = NULL;
@@
-187,7
+188,7
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == _UNIT_FILE_STATE_INVALID);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == _UNIT_FILE_STATE_INVALID);
log_error("link files2");
changes = NULL;
log_error("link files2");
changes = NULL;
@@
-199,7
+200,7
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == UNIT_FILE_LINKED);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == UNIT_FILE_LINKED);
log_error("disable files2");
changes = NULL;
log_error("disable files2");
changes = NULL;
@@
-211,7
+212,7
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == _UNIT_FILE_STATE_INVALID);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == _UNIT_FILE_STATE_INVALID);
log_error("link files2");
changes = NULL;
log_error("link files2");
changes = NULL;
@@
-223,7
+224,7
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == UNIT_FILE_LINKED);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == UNIT_FILE_LINKED);
log_error("reenable files2");
changes = NULL;
log_error("reenable files2");
changes = NULL;
@@
-235,7
+236,7
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == UNIT_FILE_ENABLED);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == UNIT_FILE_ENABLED);
log_error("disable files2");
changes = NULL;
log_error("disable files2");
changes = NULL;
@@
-247,18
+248,18
@@
int main(int argc, char* argv[]) {
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files2[0])) == _UNIT_FILE_STATE_INVALID);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files2[0])) == _UNIT_FILE_STATE_INVALID);
log_error("preset files");
changes = NULL;
n_changes = 0;
log_error("preset files");
changes = NULL;
n_changes = 0;
- r = unit_file_preset(UNIT_FILE_SYSTEM, false, NULL, (char**) files, false, &changes, &n_changes);
+ r = unit_file_preset(UNIT_FILE_SYSTEM, false, NULL, (char**) files,
UNIT_FILE_PRESET_FULL,
false, &changes, &n_changes);
assert_se(r >= 0);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
assert_se(r >= 0);
dump_changes(changes, n_changes);
unit_file_changes_free(changes, n_changes);
- assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
file_name_from_path
(files[0])) == UNIT_FILE_ENABLED);
+ assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, NULL,
basename
(files[0])) == UNIT_FILE_ENABLED);
return 0;
}
return 0;
}