Commit | Line | Data |
---|---|---|
85c77480 KK |
1 | This patch removes a group of tests that fail because /var/lib/dbus/machine-id |
2 | is not present in the build environment. | |
3 | ||
910f1709 KK |
4 | --- gcr-3.20.0.old/Makefile.in 2017-07-03 18:05:10.742595317 -0400 |
5 | +++ gcr-3.20.0/Makefile.in 2017-07-03 18:08:26.379565428 -0400 | |
85c77480 | 6 | @@ -482,8 +482,7 @@ |
910f1709 KK |
7 | test-openssh$(EXEEXT) test-secure-memory$(EXEEXT) \ |
8 | test-trust$(EXEEXT) test-parser$(EXEEXT) test-record$(EXEEXT) \ | |
9 | test-memory-icon$(EXEEXT) test-gnupg-key$(EXEEXT) \ | |
85c77480 KK |
10 | - test-gnupg-collection$(EXEEXT) test-gnupg-process$(EXEEXT) \ |
11 | - test-system-prompt$(EXEEXT) | |
12 | + test-gnupg-collection$(EXEEXT) test-gnupg-process$(EXEEXT) | |
13 | @WITH_GTK_TRUE@am__EXEEXT_4 = frob-certificate$(EXEEXT) \ | |
14 | @WITH_GTK_TRUE@ frob-combo-selector$(EXEEXT) \ | |
15 | @WITH_GTK_TRUE@ frob-gnupg-selector$(EXEEXT) \ | |
16 | @@ -882,14 +881,6 @@ | |
17 | am_test_symkey_OBJECTS = egg/test-symkey.$(OBJEXT) | |
18 | test_symkey_OBJECTS = $(am_test_symkey_OBJECTS) | |
19 | test_symkey_DEPENDENCIES = $(am__DEPENDENCIES_4) | |
20 | -am_test_system_prompt_OBJECTS = \ | |
21 | - gcr/test_system_prompt-test-system-prompt.$(OBJEXT) | |
22 | -test_system_prompt_OBJECTS = $(am_test_system_prompt_OBJECTS) | |
23 | -test_system_prompt_DEPENDENCIES = $(am__DEPENDENCIES_3) | |
24 | -test_system_prompt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | |
25 | - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | |
26 | - $(test_system_prompt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | |
27 | - $(LDFLAGS) -o $@ | |
28 | am_test_trust_OBJECTS = gcr/test_trust-test-trust.$(OBJEXT) | |
29 | test_trust_OBJECTS = $(am_test_trust_OBJECTS) | |
30 | test_trust_DEPENDENCIES = $(am__DEPENDENCIES_3) | |
31 | @@ -974,8 +965,7 @@ | |
910f1709 KK |
32 | $(test_secret_exchange_SOURCES) $(test_secure_memory_SOURCES) \ |
33 | $(test_simple_certificate_SOURCES) \ | |
34 | $(test_subject_public_key_SOURCES) $(test_symkey_SOURCES) \ | |
85c77480 KK |
35 | - $(test_system_prompt_SOURCES) $(test_trust_SOURCES) \ |
36 | - $(test_util_SOURCES) | |
37 | + $(test_trust_SOURCES) $(test_util_SOURCES) | |
38 | DIST_SOURCES = $(libegg_asn1x_la_SOURCES) $(libegg_hex_la_SOURCES) \ | |
910f1709 KK |
39 | $(libegg_secmem_la_SOURCES) $(libegg_test_la_SOURCES) \ |
40 | $(libegg_la_SOURCES) $(libgck_@GCK_MAJOR@_la_SOURCES) \ | |
85c77480 | 41 | @@ -1016,8 +1006,7 @@ |
910f1709 KK |
42 | $(test_secret_exchange_SOURCES) $(test_secure_memory_SOURCES) \ |
43 | $(test_simple_certificate_SOURCES) \ | |
44 | $(test_subject_public_key_SOURCES) $(test_symkey_SOURCES) \ | |
85c77480 KK |
45 | - $(test_system_prompt_SOURCES) $(test_trust_SOURCES) \ |
46 | - $(test_util_SOURCES) | |
47 | + $(test_trust_SOURCES) $(test_util_SOURCES) | |
48 | RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ | |
910f1709 KK |
49 | ctags-recursive dvi-recursive html-recursive info-recursive \ |
50 | install-data-recursive install-dvi-recursive \ | |
85c77480 | 51 | @@ -2117,8 +2106,7 @@ |
910f1709 KK |
52 | test-memory-icon \ |
53 | test-gnupg-key \ | |
54 | test-gnupg-collection \ | |
85c77480 KK |
55 | - test-gnupg-process \ |
56 | - test-system-prompt | |
57 | + test-gnupg-process | |
910f1709 | 58 | |
85c77480 KK |
59 | test_certificate_SOURCES = gcr/test-certificate.c |
60 | test_certificate_CFLAGS = $(gcr_CFLAGS) | |
61 | @@ -2171,9 +2159,6 @@ | |
62 | test_subject_public_key_SOURCES = gcr/test-subject-public-key.c | |
63 | test_subject_public_key_CFLAGS = $(gcr_CFLAGS) | |
64 | test_subject_public_key_LDADD = $(gcr_LIBS) | |
65 | -test_system_prompt_SOURCES = gcr/test-system-prompt.c | |
66 | -test_system_prompt_CFLAGS = $(gcr_CFLAGS) | |
67 | -test_system_prompt_LDADD = $(gcr_LIBS) | |
68 | test_trust_SOURCES = gcr/test-trust.c | |
69 | test_trust_CFLAGS = $(gcr_CFLAGS) | |
70 | test_trust_LDADD = $(gcr_LIBS) | |
910f1709 KK |
71 | @@ -3283,12 +3268,6 @@ |
72 | test-symkey$(EXEEXT): $(test_symkey_OBJECTS) $(test_symkey_DEPENDENCIES) $(EXTRA_test_symkey_DEPENDENCIES) | |
73 | @rm -f test-symkey$(EXEEXT) | |
74 | $(AM_V_CCLD)$(LINK) $(test_symkey_OBJECTS) $(test_symkey_LDADD) $(LIBS) | |
85c77480 KK |
75 | -gcr/test_system_prompt-test-system-prompt.$(OBJEXT): \ |
76 | - gcr/$(am__dirstamp) gcr/$(DEPDIR)/$(am__dirstamp) | |
910f1709 KK |
77 | - |
78 | -test-system-prompt$(EXEEXT): $(test_system_prompt_OBJECTS) $(test_system_prompt_DEPENDENCIES) $(EXTRA_test_system_prompt_DEPENDENCIES) | |
85c77480 KK |
79 | - @rm -f test-system-prompt$(EXEEXT) |
80 | - $(AM_V_CCLD)$(test_system_prompt_LINK) $(test_system_prompt_OBJECTS) $(test_system_prompt_LDADD) $(LIBS) | |
81 | gcr/test_trust-test-trust.$(OBJEXT): gcr/$(am__dirstamp) \ | |
910f1709 KK |
82 | gcr/$(DEPDIR)/$(am__dirstamp) |
83 | ||
84 | @@ -3446,7 +3425,6 @@ | |
85c77480 KK |
85 | @AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_secure_memory-test-secure-memory.Po@am__quote@ |
86 | @AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_simple_certificate-test-simple-certificate.Po@am__quote@ | |
87 | @AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_subject_public_key-test-subject-public-key.Po@am__quote@ | |
88 | -@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Po@am__quote@ | |
89 | @AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_trust-test-trust.Po@am__quote@ | |
90 | @AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_util-test-util.Po@am__quote@ | |
91 | @AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/frob_certificate-frob-certificate.Po@am__quote@ | |
910f1709 | 92 | @@ -4968,20 +4946,6 @@ |
85c77480 KK |
93 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
94 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_subject_public_key_CFLAGS) $(CFLAGS) -c -o gcr/test_subject_public_key-test-subject-public-key.obj `if test -f 'gcr/test-subject-public-key.c'; then $(CYGPATH_W) 'gcr/test-subject-public-key.c'; else $(CYGPATH_W) '$(srcdir)/gcr/test-subject-public-key.c'; fi` | |
910f1709 | 95 | |
85c77480 KK |
96 | -gcr/test_system_prompt-test-system-prompt.o: gcr/test-system-prompt.c |
97 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -MT gcr/test_system_prompt-test-system-prompt.o -MD -MP -MF gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo -c -o gcr/test_system_prompt-test-system-prompt.o `test -f 'gcr/test-system-prompt.c' || echo '$(srcdir)/'`gcr/test-system-prompt.c | |
98 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Po | |
99 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcr/test-system-prompt.c' object='gcr/test_system_prompt-test-system-prompt.o' libtool=no @AMDEPBACKSLASH@ | |
100 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
101 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -c -o gcr/test_system_prompt-test-system-prompt.o `test -f 'gcr/test-system-prompt.c' || echo '$(srcdir)/'`gcr/test-system-prompt.c | |
102 | - | |
103 | -gcr/test_system_prompt-test-system-prompt.obj: gcr/test-system-prompt.c | |
104 | -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -MT gcr/test_system_prompt-test-system-prompt.obj -MD -MP -MF gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo -c -o gcr/test_system_prompt-test-system-prompt.obj `if test -f 'gcr/test-system-prompt.c'; then $(CYGPATH_W) 'gcr/test-system-prompt.c'; else $(CYGPATH_W) '$(srcdir)/gcr/test-system-prompt.c'; fi` | |
105 | -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Po | |
106 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcr/test-system-prompt.c' object='gcr/test_system_prompt-test-system-prompt.obj' libtool=no @AMDEPBACKSLASH@ | |
107 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
108 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -c -o gcr/test_system_prompt-test-system-prompt.obj `if test -f 'gcr/test-system-prompt.c'; then $(CYGPATH_W) 'gcr/test-system-prompt.c'; else $(CYGPATH_W) '$(srcdir)/gcr/test-system-prompt.c'; fi` | |
109 | - | |
110 | gcr/test_trust-test-trust.o: gcr/test-trust.c | |
111 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_trust_CFLAGS) $(CFLAGS) -MT gcr/test_trust-test-trust.o -MD -MP -MF gcr/$(DEPDIR)/test_trust-test-trust.Tpo -c -o gcr/test_trust-test-trust.o `test -f 'gcr/test-trust.c' || echo '$(srcdir)/'`gcr/test-trust.c | |
112 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) gcr/$(DEPDIR)/test_trust-test-trust.Tpo gcr/$(DEPDIR)/test_trust-test-trust.Po | |
910f1709 KK |
113 | @@ -5808,13 +5772,6 @@ |
114 | $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ | |
115 | --log-file $$b.log --trs-file $$b.trs \ | |
116 | $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ | |
85c77480 KK |
117 | - "$$tst" $(AM_TESTS_FD_REDIRECT) |
118 | -test-system-prompt.log: test-system-prompt$(EXEEXT) | |
119 | - @p='test-system-prompt$(EXEEXT)'; \ | |
120 | - b='test-system-prompt'; \ | |
121 | - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ | |
122 | - --log-file $$b.log --trs-file $$b.trs \ | |
123 | - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ | |
910f1709 | 124 | "$$tst" $(AM_TESTS_FD_REDIRECT) |
85c77480 | 125 | .test.log: |
910f1709 | 126 | @p='$<'; \ |