summaryrefslogtreecommitdiff
path: root/tests/scripts/features
diff options
context:
space:
mode:
Diffstat (limited to 'tests/scripts/features')
-rw-r--r--tests/scripts/features/conditionals5
-rw-r--r--tests/scripts/features/export4
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/scripts/features/conditionals b/tests/scripts/features/conditionals
index ab3d9d5..9aad1d1 100644
--- a/tests/scripts/features/conditionals
+++ b/tests/scripts/features/conditionals
@@ -51,7 +51,6 @@ close(MAKEFILE);
&run_make_with_options($makefile,"",&get_logfile,0);
-# Create the answer to what should be produced by this Makefile
$answer = "arg1 NOT equal arg2
arg2 equals arg5
arg3 NOT equal arg4
@@ -59,8 +58,6 @@ variable is undefined
arg4 is defined
";
-# COMPARE RESULTS
-
&compare_output($answer,&get_logfile(1));
@@ -92,6 +89,8 @@ all:; @echo DEF=$(DEF) DEF2=$(DEF2)
EOF
+close(MAKEFILE)
+
&run_make_with_options($makefile2,"",&get_logfile,0);
$answer = "DEF=yes DEF2=yes\n";
&compare_output($answer,&get_logfile(1));
diff --git a/tests/scripts/features/export b/tests/scripts/features/export
index 09aeac2..3d630a4 100644
--- a/tests/scripts/features/export
+++ b/tests/scripts/features/export
@@ -131,6 +131,8 @@ all:
EOF
+close(MAKEFILE);
+
&run_make_with_options($makefile2,"",&get_logfile,0);
$answer = "foo=f-ok bar=b-ok\nfoo=f-ok bar=b-ok\n";
&compare_output($answer,&get_logfile(1));
@@ -164,6 +166,8 @@ all:
EOF
+close(MAKEFILE);
+
&run_make_with_options($makefile3,"",&get_logfile,0);
$answer = "foo=f-ok bar=b-ok\nfoo= bar=\n";
&compare_output($answer,&get_logfile(1));