Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ufebl
mjtest
Commits
915e38ce
Commit
915e38ce
authored
Dec 02, 2016
by
Johannes Bechberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix small mjtest issue
parent
62e7ac8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
mjtest/environment.py
mjtest/environment.py
+1
-6
mjtest/test/exec_tests.py
mjtest/test/exec_tests.py
+1
-1
mjtest/test/tests.py
mjtest/test/tests.py
+1
-0
No files found.
mjtest/environment.py
View file @
915e38ce
...
...
@@ -191,13 +191,8 @@ class Environment:
if
os
.
path
.
exists
(
dst_file
)
and
os
.
path
.
isfile
(
dst_file
)
and
os
.
path
.
getmtime
(
file
)
<
os
.
path
.
getmtime
(
dst_file
)
and
False
:
_LOG
.
debug
(
"File '{}' already exists in a pre processed form"
.
format
(
os
.
path
.
relpath
(
file
)))
return
dst_file
cur
=
os
.
path
.
split
(
dst_file
)[
0
]
while
not
os
.
path
.
exists
(
cur
):
os
.
mkdir
(
cur
)
cur
=
os
.
path
.
split
(
cur
)[
0
]
if
not
os
.
path
.
exists
(
dst_dir
):
os
.
m
k
dir
(
dst_dir
)
os
.
m
ake
dir
s
(
dst_dir
,
exist_ok
=
True
)
try
:
PreProcessor
(
file
,
import_base_dir
,
dst_file
).
preprocess
()
except
:
...
...
mjtest/test/exec_tests.py
View file @
915e38ce
...
...
@@ -43,7 +43,7 @@ class JavaExecTest(BasicSyntaxTest):
is_big_testcase
=
"big"
in
self
.
file
timeout
=
self
.
env
.
big_timeout
if
is_big_testcase
else
self
.
env
.
timeout
base_filename
=
path
.
basename
(
self
.
file
).
split
(
"."
)[
0
]
tmp_dir
=
self
.
env
.
create_tmpdir
()
tmp_dir
=
self
.
env
.
create_
pid_local_
tmpdir
()
shutil
.
copy
(
self
.
preprocessed_file
,
path
.
join
(
tmp_dir
,
base_filename
+
".java"
))
cwd
=
os
.
getcwd
()
os
.
chdir
(
tmp_dir
)
...
...
mjtest/test/tests.py
View file @
915e38ce
...
...
@@ -352,6 +352,7 @@ class ExtensibleTestResult(TestResult):
texts
.
append
(
self
.
_ident
(
msg
.
content
))
else
:
texts
.
append
(
msg
.
content
)
texts
.
append
(
""
)
else
:
texts
.
append
(
"{}: {}"
.
format
(
msg
.
title
,
msg
.
content
))
return
"
\n
"
.
join
(
texts
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment