[gnome-keyring] No more prompt tests.



commit c16b8c01ad9fd6a564e06935781e385e84547be2
Author: Stef Walter <stef memberwebs com>
Date:   Tue Jun 8 15:10:52 2010 +0000

    No more prompt tests.
    
     * These were an old concept of tests that didn't run automatically.
     * Also remove PAM tests, as they were completely broken, and prompt style.

 .gitignore                        |    1 -
 configure.in                      |    1 -
 egg/tests/.gitignore              |    2 -
 gcr/tests/.gitignore              |    2 -
 gp11/tests/.gitignore             |    3 -
 gp11/tests/Makefile.am            |    2 -
 pam/Makefile.am                   |    8 ---
 pam/tests/.gitignore              |    4 -
 pam/tests/Makefile.am             |   10 ---
 pam/tests/unit-test-pam-setup.c   |  116 -------------------------------------
 pam/tests/unit-test-pam.c         |   73 -----------------------
 pkcs11/gkm/tests/.gitignore       |    2 -
 pkcs11/ssh-store/tests/.gitignore |    2 -
 tests/gtest.make                  |   28 +--------
 14 files changed, 2 insertions(+), 252 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db64ab0..d8e301a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@ Makefile
 Makefile.in
 core
 run-auto-test*
-run-prompt-test*
 *-marshal.[ch]
 .libs
 .deps
diff --git a/configure.in b/configure.in
index 409425b..830c10b 100644
--- a/configure.in
+++ b/configure.in
@@ -570,7 +570,6 @@ gp11/gp11.pc
 gp11/Makefile
 gp11/tests/Makefile
 pam/Makefile
-pam/tests/Makefile
 pkcs11/Makefile
 pkcs11/gkm/Makefile
 pkcs11/gkm/tests/Makefile
diff --git a/egg/tests/.gitignore b/egg/tests/.gitignore
index d21fd7e..1ff6d55 100644
--- a/egg/tests/.gitignore
+++ b/egg/tests/.gitignore
@@ -6,5 +6,3 @@
 /Makefile
 /Makefile.in
 /run-auto-test
-run-prompt-test*
-
diff --git a/gcr/tests/.gitignore b/gcr/tests/.gitignore
index 3562174..217eaf9 100644
--- a/gcr/tests/.gitignore
+++ b/gcr/tests/.gitignore
@@ -6,5 +6,3 @@
 /.deps
 /.libs
 /ui-test-details
-run-prompt-test*
-
diff --git a/gp11/tests/.gitignore b/gp11/tests/.gitignore
index 63612ca..68d9409 100644
--- a/gp11/tests/.gitignore
+++ b/gp11/tests/.gitignore
@@ -1,9 +1,6 @@
 /run-auto-test.h
-/run-prompt-test.h
 /run-auto-test.c
-/run-prompt-test.c
 /run-auto-test
-/run-prompt-test
 /Makefile
 /Makefile.in
 /.*
diff --git a/gp11/tests/Makefile.am b/gp11/tests/Makefile.am
index 9b0b4c1..c0af4a3 100644
--- a/gp11/tests/Makefile.am
+++ b/gp11/tests/Makefile.am
@@ -12,8 +12,6 @@ UNIT_AUTO = \
 UNIT_FLAGS = \
 	-I$(top_srcdir)/gp11/ \
 	-DEXTERNAL_TEST
-	
-UNIT_PROMPT = 
 
 UNIT_LIBS = \
 	$(GIO_LIBS) \
diff --git a/pam/Makefile.am b/pam/Makefile.am
index 32f1e7c..81bda13 100644
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -24,11 +24,3 @@ pam_gnome_keyring_la_LDFLAGS = \
 
 install-pam: install
 	@echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead"
-	
-if WITH_TESTS
-TESTS_DIR = tests
-else
-TESTS_DIR = 
-endif
-
-SUBDIRS = . $(TESTS_DIR)
diff --git a/pkcs11/gkm/tests/.gitignore b/pkcs11/gkm/tests/.gitignore
index e13930f..8178432 100644
--- a/pkcs11/gkm/tests/.gitignore
+++ b/pkcs11/gkm/tests/.gitignore
@@ -1,9 +1,7 @@
 /run-auto-test.*
 /asn1-def-test.h
-/run-prompt-test.*
 /.*
 /Makefile
 /Makefile.in
 /run-auto-test
-/run-prompt-test
 /dump-data-file
diff --git a/pkcs11/ssh-store/tests/.gitignore b/pkcs11/ssh-store/tests/.gitignore
index f931abc..5829e75 100644
--- a/pkcs11/ssh-store/tests/.gitignore
+++ b/pkcs11/ssh-store/tests/.gitignore
@@ -4,5 +4,3 @@
 /Makefile
 /Makefile.in
 /run-auto-test
-run-prompt-test*
-
diff --git a/tests/gtest.make b/tests/gtest.make
index d9ae39f..32e4351 100644
--- a/tests/gtest.make
+++ b/tests/gtest.make
@@ -1,7 +1,6 @@
 
 # The following need to be declared before this file is included:
 #   UNIT_AUTO     A list of C files with tests
-#   UNIT_PROMPT   A list of C files with prompting tests
 #   UNIT_LIBS     Libraries to link the tests to
 
 # ------------------------------------------------------------------------------
@@ -22,8 +21,7 @@ LIBS = \
 	$(P11_TESTS_LIBS)
 
 noinst_PROGRAMS= \
-	run-auto-test \
-	run-prompt-test
+	run-auto-test
 		
 run-auto-test.h: $(UNIT_AUTO) Makefile.am $(top_srcdir)/tests/prep-gtest.sh
 	sh $(top_srcdir)/tests/prep-gtest.sh -b run-auto-test $(UNIT_AUTO)
@@ -41,28 +39,9 @@ run_auto_test_LDADD = \
 run_auto_test_CFLAGS = \
 	$(UNIT_FLAGS)
 
-run-prompt-test.h: $(UNIT_PROMPT) Makefile.am $(top_srcdir)/tests/prep-gtest.sh
-	sh $(top_srcdir)/tests/prep-gtest.sh -b run-prompt-test $(UNIT_PROMPT)
-
-run-prompt-test.c: run-prompt-test.h
-
-run_prompt_test_SOURCES = \
-	run-prompt-test.c \
-	run-prompt-test.h \
-	$(UNIT_PROMPT)
-
-run_prompt_test_LDADD = \
-	$(UNIT_LIBS) \
-	$(DAEMON_LIBS)
-
-run_prompt_test_CFLAGS = \
-	$(UNIT_FLAGS)
-
 BUILT_SOURCES = \
 	run-auto-test.c \
-	run-auto-test.h \
-	run-prompt-test.c \
-	run-prompt-test.h
+	run-auto-test.h
 
 # ------------------------------------------------------------------------------
 # Run the tests
@@ -70,8 +49,5 @@ BUILT_SOURCES = \
 test-auto: $(noinst_PROGRAMS)
 	gtester --verbose -k -m=slow ./run-auto-test
 
-test-prompt: $(noinst_PROGRAMS)
-	gtester --verbose -k -m=slow ./run-prompt-test
-
 check-am: $(noinst_PROGRAMS)
 	TEST_DATA=$(srcdir)/test-data gtester -m=slow --verbose ./run-auto-test



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]