mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 07:26:54 +00:00
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 41cb7db..93ef0ec 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0)
|
|
|
|
AC_PATH_PROG([PYTHON],[python])
|
|
AC_MSG_CHECKING(for gtester2xunit dependencies)
|
|
-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
|
|
+if !($PYTHON -c "import lxml" 2> /dev/null); then
|
|
AC_MSG_RESULT([no])
|
|
- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
|
|
+ AC_MSG_ERROR([You need to install python-lxml]);
|
|
fi
|
|
AC_MSG_RESULT([yes])
|
|
|
|
@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION}
|
|
Introspection: ${enable_introspection}
|
|
Headless tests: ${enable_headless_tests}
|
|
Coverage Reporting: ${use_gcov}
|
|
- Export actions menus: ${enable_export_actions_menu}
|
|
+ Export actions menus: ${enable_export_actions_menu}
|
|
|
|
EOF
|
|
diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py
|
|
index fbe3c66..861d541 100755
|
|
--- a/tests/gtester2xunit.py
|
|
+++ b/tests/gtester2xunit.py
|
|
@@ -1,18 +1,17 @@
|
|
#! /usr/bin/python
|
|
from argparse import ArgumentParser
|
|
-import libxslt
|
|
-import libxml2
|
|
import sys
|
|
import os
|
|
+from lxml import etree
|
|
|
|
XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
|
|
|
|
def transform_file(input_filename, output_filename, xsl_file):
|
|
- gtester = libxml2.parseFile(xsl_file)
|
|
- style = libxslt.parseStylesheetDoc(gtester)
|
|
- doc = libxml2.parseFile(input_filename)
|
|
- result = style.applyStylesheet(doc, None)
|
|
- result.saveFormatFile(filename=output_filename, format=True)
|
|
+ gtester = etree.parse(xsl_file)
|
|
+ style = etree.XSLT(gtester)
|
|
+ doc = etree.parse(input_filename)
|
|
+ result = style(doc)
|
|
+ result.write(filename=output_filename, format=True)
|
|
|
|
|
|
def get_output_filename(input_filename):
|