christoph/fail
1
Fork 0
Code Releases Activity

Merge changes I7de68835,I27d83526

Browse Source 
* changes:
  GenericExperiment: Fix definition of "detected-marker"
  Gitignore: ignore vim swap files
This commit is contained in:
Christian Dietrich
2015-08-05 09:42:23 +02:00
committed by Gerrit Code Review
parent 1d9dae0e21 ce41b30fb1
commit d2f99b909f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@
*.pb.cc *.pb.cc
*.gcda *.gcda
*.pyc *.pyc
*.swp
*~ *~
Makefile Makefile
build build

2
src/experiments/generic-experiment/experiment.hpp
View File

@ -59,7 +59,7 @@ public:
end_marker_groups["ok-marker"] = &OK_marker; end_marker_groups["ok-marker"] = &OK_marker;
end_marker_groups["fail-marker"] = &FAIL_marker; end_marker_groups["fail-marker"] = &FAIL_marker;
end_marker_groups["detected-marker"] = &FAIL_marker; end_marker_groups["detected-marker"] = &DETECTED_marker;
end_marker_groups["group1-marker"] = &GROUP1_marker; end_marker_groups["group1-marker"] = &GROUP1_marker;
end_marker_groups["group2-marker"] = &GROUP2_marker; end_marker_groups["group2-marker"] = &GROUP2_marker;
end_marker_groups["group3-marker"] = &GROUP3_marker; end_marker_groups["group3-marker"] = &GROUP3_marker;