diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-29 23:42:23 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus@libreoffice.org> | 2016-12-30 07:16:03 +0000 |
| commit | d8a9d483898d94868bc502d52f0fcd166d18959f (patch) | |
| tree | a423441fcdd9ec53285926a435c05d23595642ab /bin | |
| parent | bd9009bdadb2a35c0271f7c12384bb96831a9bf3 (diff) | |
Workaround strange sw test makefiles
Include ooxmlexport_setup.mk only once in Module_sw.mk,
so that gbuildtojson can properly set last included
makefile for test jsons.
Change-Id: Ie8ed3296ae97cf4a33d652599673f389b224993e
Reviewed-on: https://gerrit.libreoffice.org/32502
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gbuild-to-ide | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 3b8439439b7b..451f6b5eb867 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -149,16 +149,8 @@ class GbuildParser: @staticmethod def __test_from_json(json): (foundincludes, foundisystem) = GbuildParser.__split_includes(json['INCLUDE']) - testname_match = GbuildParser.testpattern.match(os.path.basename(json['MAKEFILE'])) - - # Workaround strange writer test makefile setup - if testname_match is None: - testname = "StrangeWriterMakefiles" - else: - testname = testname_match.group(1) - return GbuildTest( - testname, + GbuildParser.testpattern.match(os.path.basename(json['MAKEFILE'])).group(1), os.path.dirname(json['MAKEFILE']), foundincludes, foundisystem, |