Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
projet
VPLPP
Commits
f3389f85
Commit
f3389f85
authored
Jun 08, 2020
by
Guillaume Huard
Browse files
Bugfix (case field not properly overriden by a test field)
parent
4730a028
Changes
2
Show whitespace changes
Inline
Side-by-side
Basic_System/ef/vpl_evaluate.pl
View file @
f3389f85
...
...
@@ -313,7 +313,7 @@ sub run_special($$$$$) {
$special
=
{
content
=>
$content
};
}
else
{
# Values of special are written to test to be able to overwrite intput and args in special
# This is especially useful
l
for a validator
# This is especially useful for a validator
my
$given_test
=
$test
;
$test
=
{};
add_values
(
$test
,
$given_test
);
...
...
@@ -332,7 +332,7 @@ sub run_special($$$$$) {
}
}
# compile if required
if
(
exists
(
$special
->
{
compile
})
&&
!
$special
->
{
compiled
})
{
if
(
exists
(
$special
->
{
compile
})
)
{
#
&& !$special->{compiled}) {
debug
("
Compiling
$name
with
@{
$
special
->{
files}
}
\n
");
setup_env
(
$name
,
$special
);
my
$data
=
run_special
(
$name
,
'
.compile
',
$special
->
{
compile
},
$special
,
0
);
...
...
@@ -343,7 +343,7 @@ sub run_special($$$$$) {
print
("
Compilation output :
$data
->{output}
\n
")
if
length
(
$data
->
{
output
});
print
STDERR
("
Compilation error :
$data
->{error}
\n
")
if
length
(
$data
->
{
error
});
}
$special
->
{
compiled
}
=
1
;
#
$special->{compiled} = 1;
}
# Adds limits if any
if
(
exists
(
$special
->
{
output_limit
})
||
exists
(
$special
->
{
error_limit
})
||
exists
(
$special
->
{
timeout
}))
{
...
...
@@ -359,7 +359,7 @@ sub run_special($$$$$) {
$result
=
run_command
(
$test_name
,
"
./
$name
",
$test
,
$has_limits
);
}
if
(
exists
(
$special
->
{
content
}))
{
remove
("
$name
")
unless
$special
->
{
compiled
}
or
$special
->
{
keep
};
remove
("
$name
")
unless
$special
->
{
keep
};
#
or $special->{
compiled
};
}
return
$result
;
}
...
...
@@ -472,7 +472,7 @@ sub perform_tests($$) {
}
# runs program
my
$data
=
run_special
(
$test_name
,
$program
,
$
case
,
$test
,
1
);
my
$data
=
run_special
(
$test_name
,
$program
,
$
test
,
$test
,
1
);
if
(
$data
->
{
compilation_error
})
{
$details
.=
"
Compilation errors, compiler output :
\n
"
.
preformat
(
$data
->
{
output
}
.
$data
->
{
error
});
...
...
Makefile
View file @
f3389f85
ACTIVITIES
=
$(
patsubst
%.org, %,
$(
filter-out
README.org,
$(
wildcard
*
.org
)))
DOCS_ONLY
=
README.org Methodology.org
ACTIVITIES
=
$(
patsubst
%.org, %,
$(
filter-out
$(DOCS_ONLY)
,
$(
wildcard
*
.org
)))
ALL_VPL_IDS
=
$(
addsuffix
/vpl_id.txt,
$(ACTIVITIES)
)
VPL_IDS
=
$(
filter-out
Default_%,
$(ALL_VPL_IDS)
)
DEFAULT_VPL_IDS
=
$(
filter
Default_%,
$(ALL_VPL_IDS)
)
...
...
Write
Preview
Supports
Markdown
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