From ccab1dba796c726786481254d26565835adaa039 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Thu, 23 Oct 2014 16:53:50 +0200
Subject: [PATCH] test-suite: use only python3
Change-Id: I2e9d3ea6de6c0c207ae3d3d285d3c2769f81af46
---
generator/CMakeLists.txt | 2 +-
generator/LLVMPYAnalysis.py | 2 --
generator/RTSCAnalysis.py | 2 --
generator/SystemDescription.py | 2 --
test/CMakeLists.txt | 2 +-
toolchain/ctest2jenkins/convert.py | 12 ++++--------
6 files changed, 6 insertions(+), 16 deletions(-)
mode change 100755 => 100644 generator/LLVMPYAnalysis.py
mode change 100755 => 100644 generator/SystemDescription.py
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index d1029a6b..94d28969 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -7,7 +7,7 @@ set(PYTHON_MODULES_TEST
foreach(module ${PYTHON_MODULES_TEST})
add_test(NAME generator/${module}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../ python ${CMAKE_CURRENT_SOURCE_DIR}/${module}.py)
+ COMMAND env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../ python3 ${CMAKE_CURRENT_SOURCE_DIR}/${module}.py)
endforeach(module)
SET(COREDOS_GENERATOR_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "")
diff --git a/generator/LLVMPYAnalysis.py b/generator/LLVMPYAnalysis.py
old mode 100755
new mode 100644
index 34381262..9da28a7d
--- a/generator/LLVMPYAnalysis.py
+++ b/generator/LLVMPYAnalysis.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
import llvm
import llvm.core
import sys
diff --git a/generator/RTSCAnalysis.py b/generator/RTSCAnalysis.py
index 34f85c3f..02f6052b 100644
--- a/generator/RTSCAnalysis.py
+++ b/generator/RTSCAnalysis.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
from lxml import objectify
from collections import namedtuple
diff --git a/generator/SystemDescription.py b/generator/SystemDescription.py
old mode 100755
new mode 100644
index 2a73c98e..03242ba7
--- a/generator/SystemDescription.py
+++ b/generator/SystemDescription.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
from lxml import objectify
import os
from collections import namedtuple
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 75322a77..345e14d6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -39,7 +39,7 @@ add_custom_target( ctest2jenkins
add_custom_command(
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMAND ctest -V -D ExperimentalTest || true
- COMMAND python ${CONVERTPY} ${PROJECT_BINARY_DIR} ${CONVXSL} > BaseTest.xml
+ COMMAND python3 ${CONVERTPY} ${PROJECT_BINARY_DIR} ${CONVXSL} > BaseTest.xml
DEPENDS tests
OUTPUT ${XUNITOUTPUT}
)
diff --git a/toolchain/ctest2jenkins/convert.py b/toolchain/ctest2jenkins/convert.py
index abb80692..36c752ff 100644
--- a/toolchain/ctest2jenkins/convert.py
+++ b/toolchain/ctest2jenkins/convert.py
@@ -1,18 +1,14 @@
from lxml import etree
-import StringIO
import sys
TAGfile = open(sys.argv[1]+"/Testing/TAG", 'r')
dirname = TAGfile.readline().strip()
-xmlfile = open(sys.argv[1]+"/Testing/"+dirname+"/Test.xml", 'r')
-xslfile = open(sys.argv[2], 'r')
+xmlfile = sys.argv[1]+"/Testing/"+dirname+"/Test.xml"
+xslfile = sys.argv[2]
-xmlcontent = xmlfile.read()
-xslcontent = xslfile.read()
-
-xmldoc = etree.parse(StringIO.StringIO(xmlcontent))
-xslt_root = etree.XML(xslcontent)
+xmldoc = etree.parse(xmlfile)
+xslt_root = etree.parse(xslfile)
transform = etree.XSLT(xslt_root)
result_tree = transform(xmldoc)
--
GitLab