Permalink
Browse files

Display --config_name parameter in log

  • Loading branch information...
1 parent 6c79351 commit 165b33f35d4109aa2adb9c22169ce7c65b367889 @hawk committed Apr 20, 2012
Showing with 7 additions and 5 deletions.
  1. +2 −3 examples/calc.lux
  2. +5 −2 src/lux_suite.erl
View
@@ -11,7 +11,7 @@
!2^8
?256
-# Call some macros and use global+my variable
+# Call some macros and use global and my scoped variables
[shell main]
-$fail_pattern
[invoke calc "2+1"]
@@ -32,12 +32,11 @@
[shell other]
[invoke verify 81]
- # Test some error cases
+ # Test an error case
[shell calc]
# Reset the failure pattern
-
[shell other]
- [invoke calc "1+p"]
[invoke calc "1/0"]
# Exit the shell and verify that it really exits
View
@@ -547,7 +547,8 @@ parse_config(R) ->
%% Arch spec opts
ActualConfigName = config_name(),
- {ConfigName, ConfigFile} = config_file(ConfigDir, R2#rstate.config_name, ActualConfigName),
+ {ConfigName, ConfigFile} =
+ config_file(ConfigDir, R2#rstate.config_name, ActualConfigName),
ConfigOpts = parse_config_file(R2, ConfigFile),
%% Log
@@ -605,7 +606,7 @@ log_builtins(R, ActualConfigName) ->
log(R, "~s~s\n",
[?TAG("hostname"), hostname()]),
log(R, "~s~s\n",
- [?TAG("config name"), ActualConfigName]),
+ [?TAG("architecture"), ActualConfigName]),
log(R, "~s~s\n",
[?TAG("system info"), sys_info()]),
log(R, "~s~s\n",
@@ -618,6 +619,8 @@ log_builtins(R, ActualConfigName) ->
log(R, "~s~s\n",
[?TAG("workdir"), Cwd]),
log(R, "~s~s\n",
+ [?TAG("config name"), R#rstate.config_name]),
+ log(R, "~s~s\n",
[?TAG("config_dir"), R#rstate.config_dir]).

0 comments on commit 165b33f

Please sign in to comment.