Changeset 25a549

Timestamp:

May 29, 2010, 2:00:08 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

41b123

Parents:

11cb98 (diff), fb22e4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FixtestsuiteforVerboseChanges' into CommandLineActionMapping

Location:

molecuilder

Files:

• src/Actions/MapOfActions.cpp (modified) (1 diff)
• tests/testsuite.at (modified) (2 diffs)

molecuilder/src/Actions/MapOfActions.cpp

@@ -123 +123 @@
   ShortFormMap["suspend-in-water"] = "U";
   ShortFormMap["translate-mol"] = "t";
-  ShortFormMap["verbose"] = "V";
+  ShortFormMap["verbose"] = "v";
   ShortFormMap["verlet-integrate"] = "P";
-  ShortFormMap["version"] = "v";
+  ShortFormMap["version"] = "V";
 
   // value types for the actions

molecuilder/tests/testsuite.at

@@ -11 +11 @@
 AT_KEYWORDS([options])
 AT_CHECK([pwd],[ignore],[ignore])
-AT_CHECK([../../molecuilder -v], 0, [stdout], [ignore])
+AT_CHECK([../../molecuilder -v 1], 0, [stdout], [ignore])
 AT_CHECK([fgrep olecuilder stdout], 0, [ignore], [ignore])
 AT_CHECK([../../molecuilder -h], 0, [stdout], [ignore])
@@ -103 +103 @@
 AT_KEYWORDS([graph])
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/${AUTOTEST_PATH}/regression/Graph/1/pre/test.conf .], 0)
-AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -vvv -D 2.], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder test.conf -e ${abs_top_srcdir}/src/ -v 3 -D 2.], 0, [stdout], [stderr])
 AT_CHECK([fgrep -c "No rings were detected in the molecular structure." stdout], 0, [1
 ], [ignore])