1 files changed, 1 insertions, 67 deletions
diff --git a/tests/gpgme/run-tests.scm b/tests/gpgme/run-tests.scm
index df5f5482b..e81c9e904 100644
--- a/tests/gpgme/run-tests.scm
+++ b/tests/gpgme/run-tests.scm
@@ -17,70 +17,4 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgme" "gpgme-defs.scm"))
-
-(info "Running GPGME's test suite...")
-
-(define (gpgme-makefile-expand filename port key)
-  ;;(interactive-repl (current-environment))
-  (cond
-   ((string=? key "tests_unix")
-    (if *win32*
-	(parse-makefile port key)   ;; Use win32 definition.
-	(begin
-	  (parse-makefile port key) ;; Skip win32 definition.
-	  (parse-makefile port key))))
-   (else
-    (parse-makefile port key))))
-
-(define (all-tests filename key)
-  (parse-makefile-expand filename gpgme-makefile-expand key))
-
-(let* ((runner (if (member "--parallel" *args*)
-		   run-tests-parallel
-		   run-tests-sequential))
-       (setup-c (make-environment-cache
-		 (test::scm
-		  #f
-		  (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
-		  (in-srcdir "tests" "gpgme" "setup.scm")
-		  "--" "tests" "gpg")))
-       (setup-py (make-environment-cache
-		  (test::scm
-		   #f
-		   (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
-		   (in-srcdir "tests" "gpgme" "setup.scm")
-		   "--" "lang" "python" "tests")))
-       (tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*)))
-  (runner
-   (apply
-    append
-    (map (lambda (cmpnts)
-	   (define (compiled? name)
-	     (not (or (string-suffix? name ".py")
-		      (string-suffix? name ".test"))))
-	   (define :path car)
-	   (define :key cadr)
-	   (define :setup caddr)
-	   (define (find-test name)
-	     (apply path-join
-		    `(,(if (compiled? name)
-			   gpgme-builddir
-			   gpgme-srcdir) ,@(:path cmpnts) ,(qualify name))))
-	   (let ((makefile (apply path-join `(,gpgme-srcdir ,@(:path cmpnts)
-							    "Makefile.am"))))
-	     (map (lambda (name)
-		    (apply test::scm
-			   `(,(:setup cmpnts)
-			     ,(apply path-join
-				     `("tests" "gpgme" ,@(:path cmpnts) ,name))
-			     ,(in-srcdir "tests" "gpgme" "wrap.scm")
-			     --executable
-			     ,(find-test name)
-			     -- ,@(:path cmpnts))))
-		  (if (null? tests) (all-tests makefile (:key cmpnts)) tests))))
-	 `((("tests" "gpg") "c_tests" ,setup-c)
-	   ,@(if (run-python-tests?)
-		 `((("lang" "python" "tests") "py_tests" ,setup-py))
-		 '())
-	   (("lang" "qt" "tests") "TESTS" ,setup-c))))))
+(run-tests (load-tests "tests" "gpgme"))