Merge branch 'master' of /Users/kintel/code/OpenSCAD/clang/../openscad

15 files changed, 133 insertions, 56 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c8eacfb..5eecaae 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -674,11 +674,11 @@ endfunction()
 #
 # This functions adds cmd-line tests given files.
 #
-# Usage add_cmdline_test(testname [EXE <executable>] [ARGS <args to exe>]
+# Usage add_cmdline_test(testbasename [EXE <executable>] [ARGS <args to exe>]
 #                        [EXPECTEDDIR <shared dir>] SUFFIX <suffix> FILES <test files>)
 #
 find_package(PythonInterp)
-function(add_cmdline_test TESTCMD)
+function(add_cmdline_test TESTCMD_BASENAME)
   cmake_parse_arguments(TESTCMD "" "EXE;SUFFIX;EXPECTEDDIR" "FILES;ARGS" ${ARGN})
 
   # If sharing results with another test, pass on this to the python script
@@ -686,18 +686,18 @@ function(add_cmdline_test TESTCMD)
     set(EXTRA_OPTIONS -e ${TESTCMD_EXPECTEDDIR})
   endif()
 
-  get_filename_component(TESTCMD_NAME ${TESTCMD} NAME_WE)
-
-  # If no executable was specified, assume it was built by us and resides here
-  if (NOT TESTCMD_EXE)
-    set(TESTCMD_EXE ${CMAKE_BINARY_DIR}/${TESTCMD})
+  if (TESTCMD_EXE)
+    set(TESTNAME_OPTION -t ${TESTCMD_BASENAME})
+  else()
+    # If no executable was specified, assume it was built by us and resides here
+    set(TESTCMD_EXE ${CMAKE_BINARY_DIR}/${TESTCMD_BASENAME})
   endif()
 
   # Add tests from args
   foreach (SCADFILE ${TESTCMD_FILES})
-    get_filename_component(TESTNAME ${SCADFILE} NAME_WE)
-    string(REPLACE " " "_" TESTNAME ${TESTNAME}) # Test names cannot include spaces
-    set(TEST_FULLNAME "${TESTCMD_NAME}_${TESTNAME}")
+    get_filename_component(FILE_BASENAME ${SCADFILE} NAME_WE)
+    string(REPLACE " " "_" FILE_BASENAME ${FILE_BASENAME}) # Test names cannot include spaces
+    set(TEST_FULLNAME "${TESTCMD_BASENAME}_${FILE_BASENAME}")
     list(FIND DISABLED_TESTS ${TEST_FULLNAME} DISABLED)
     if (${DISABLED} EQUAL -1)
 
@@ -719,10 +719,10 @@ function(add_cmdline_test TESTCMD)
 
       # The python script cannot extract the testname when given extra parameters
       if (TESTCMD_ARGS)
-        set(TESTNAME_OPTION -t ${TESTNAME})
+        set(FILENAME_OPTION -f ${FILE_BASENAME})
       endif()
 
-      add_test(NAME ${TEST_FULLNAME} ${CONFARG} ${CONFVAL} COMMAND ${PYTHON_EXECUTABLE} ${tests_SOURCE_DIR}/test_cmdline_tool.py ${MINGW_CROSS_ARG} --comparator=${COMPARATOR} -c ${ImageMagick_convert_EXECUTABLE} -s ${TESTCMD_SUFFIX} ${EXTRA_OPTIONS} ${TESTNAME_OPTION} ${TESTCMD_EXE} "${SCADFILE}" ${TESTCMD_ARGS})
+      add_test(NAME ${TEST_FULLNAME} ${CONFARG} ${CONFVAL} COMMAND ${PYTHON_EXECUTABLE} ${tests_SOURCE_DIR}/test_cmdline_tool.py ${MINGW_CROSS_ARG} --comparator=${COMPARATOR} -c ${ImageMagick_convert_EXECUTABLE} -s ${TESTCMD_SUFFIX} ${EXTRA_OPTIONS} ${TESTNAME_OPTION} ${FILENAME_OPTION} ${TESTCMD_EXE} "${SCADFILE}" ${TESTCMD_ARGS})
       set_property(TEST ${TEST_FULLNAME} PROPERTY ENVIRONMENT "${CTEST_ENVIRONMENT}")
     endif()
   endforeach()
@@ -763,7 +763,8 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES}
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-indexing.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/vector-values.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/search-tests.scad
-            ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/recursion-tests.scad)
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/recursion-tests.scad
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/value-reassignment-tests.scad)
 
 list(APPEND DUMPTEST_FILES ${MINIMAL_FILES} ${FEATURES_FILES} ${EXAMPLE_FILES})
 list(APPEND DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad
@@ -781,8 +782,8 @@ list(APPEND THROWNTOGETHERTEST_FILES ${OPENCSGTEST_FILES})
 
 list(APPEND CGALSTLSANITYTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/normal-nan.scad)
 
-list(APPEND GUICGALPNGTEST_FILES ${CGALPNGTEST_FILES})
-list(APPEND GUIOPENCSGTEST_FILES ${OPENCSGTEST_FILES})
+list(APPEND OPENSCAD-CGALPNG_FILES ${CGALPNGTEST_FILES})
+list(APPEND OPENSCAD-CSGPNG_FILES ${OPENCSGTEST_FILES})
 
 # Disable tests which are known to cause floating point comparison issues
 # Once we're capable of comparing these across platforms, we can put these back in
@@ -808,19 +809,19 @@ disable_tests(dumptest_transform-tests
 # FIXME: This test illustrates a weakness in child() combined with modifiers.
 # Reenable it when this is improved
 disable_tests(opencsgtest_child-background)
-disable_tests(guiopencsgtest_child-background)
+disable_tests(openscad-csgpng_child-background)
 
 # FIXME: This single test takes over an hour to run on a 2.7 GHz P4
 disable_tests(opencsgtest_example006 cgalpngtest_example006)
-disable_tests(guiopencsgtest_example006 guicgalpngtest_example006)
+disable_tests(openscad-csgpng_example006 openscad-cgalpng_example006)
 
 # These tests only makes sense in OpenCSG mode
 disable_tests(cgalpngtest_child-background
               cgalpngtest_highlight-and-background-modifier
               cgalpngtest_testcolornames
-              guicgalpngtest_child-background
-              guicgalpngtest_highlight-and-background-modifier
-              guicgalpngtest_testcolornames
+              openscad-cgalpng_child-background
+              openscad-cgalpng_highlight-and-background-modifier
+              openscad-cgalpng_testcolornames
               throwntogethertest_child-background
               throwntogethertest_highlight-and-background-modifier
               throwntogethertest_testcolornames)
@@ -829,8 +830,8 @@ disable_tests(cgalpngtest_child-background
 
 set_test_config(Heavy opencsgtest_minkowski3-tests
                       opencsgtest_projection-tests
-                      guiopencsgtest_minkowski3-tests
-                      guiopencsgtest_projection-tests
+                      openscad-csgpng_minkowski3-tests
+                      openscad-csgpng_projection-tests
                       throwntogethertest_minkowski3-tests
                       throwntogethertest_projection-tests
                       cgalpngtest_projection-tests
@@ -842,14 +843,14 @@ set_test_config(Heavy opencsgtest_minkowski3-tests
                       cgalpngtest_for-nested-tests
                       cgalpngtest_intersection-tests
                       cgalpngtest_text-search-test
-                      guicgalpngtest_projection-tests
-                      guicgalpngtest_rotate_extrude-tests
-                      guicgalpngtest_surface-tests
-                      guicgalpngtest_sphere-tests
-                      guicgalpngtest_minkowski3-tests
-                      guicgalpngtest_for-tests
-                      guicgalpngtest_for-nested-tests
-                      guicgalpngtest_intersection-tests)
+                      openscad-cgalpng_projection-tests
+                      openscad-cgalpng_rotate_extrude-tests
+                      openscad-cgalpng_surface-tests
+                      openscad-cgalpng_sphere-tests
+                      openscad-cgalpng_minkowski3-tests
+                      openscad-cgalpng_for-tests
+                      openscad-cgalpng_for-nested-tests
+                      openscad-cgalpng_intersection-tests)
 
 foreach(FILE ${EXAMPLE_FILES})
   get_test_fullname(cgalpngtest ${FILE} TEST_FULLNAME)
@@ -858,9 +859,9 @@ foreach(FILE ${EXAMPLE_FILES})
   set_test_config(Examples ${TEST_FULLNAME})
   get_test_fullname(throwntogethertest ${FILE} TEST_FULLNAME)
   set_test_config(Examples ${TEST_FULLNAME})
-  get_test_fullname(guicgalpngtest ${FILE} TEST_FULLNAME)
+  get_test_fullname(openscad-cgalpng ${FILE} TEST_FULLNAME)
   set_test_config(Examples ${TEST_FULLNAME})
-  get_test_fullname(guiopencsgtest ${FILE} TEST_FULLNAME)
+  get_test_fullname(openscad-csgpng ${FILE} TEST_FULLNAME)
   set_test_config(Examples ${TEST_FULLNAME})
 endforeach()
 
@@ -914,17 +915,73 @@ add_cmdline_test(csgtermtest SUFFIX txt FILES ${MINIMAL_FILES})
 add_cmdline_test(cgalpngtest SUFFIX png FILES ${CGALPNGTEST_FILES})
 add_cmdline_test(opencsgtest SUFFIX png FILES ${OPENCSGTEST_FILES})
 add_cmdline_test(throwntogethertest SUFFIX png FILES ${THROWNTOGETHERTEST_FILES})
-add_cmdline_test(guicgalpngtest EXE ${GUI_BINPATH} ARGS --render -o 
-                 EXPECTEDDIR cgalpngtest SUFFIX png 
-                 FILES ${GUICGALPNGTEST_FILES})
-add_cmdline_test(guiopencsgtest EXE ${GUI_BINPATH} ARGS -o 
-                 EXPECTEDDIR opencsgtest SUFFIX png 
-                 FILES ${GUICGALPNGTEST_FILES})
-
 # FIXME: We don't actually need to compare the output of cgalstlsanitytest
 # with anything. It's self-contained and returns != 0 on error
 add_cmdline_test(cgalstlsanitytest SUFFIX txt FILES ${CGALSTLSANITYTEST_FILES})
 
+# Tests using the actual OpenSCAD binary
+
+# non-ASCII filenames
+add_cmdline_test(openscad-nonascii EXE ${GUI_BINPATH} ARGS -o 
+                 SUFFIX csg 
+                 FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/sfære.scad)
+
+
+# Image output
+add_cmdline_test(openscad-cgalpng EXE ${GUI_BINPATH} ARGS --render -o 
+                 EXPECTEDDIR cgalpngtest SUFFIX png 
+                 FILES ${OPENSCAD-CGALPNG_FILES})
+add_cmdline_test(openscad-csgpng EXE ${GUI_BINPATH} ARGS -o 
+                 EXPECTEDDIR opencsgtest SUFFIX png 
+                 FILES ${OPENSCAD-CGALPNG_FILES})
+
+add_cmdline_test(openscad-imgsize EXE ${GUI_BINPATH}
+                 ARGS --imgsize 100,100 -o 
+                 SUFFIX png 
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-imgstretch EXE ${GUI_BINPATH}
+                 ARGS --imgsize 500,100 -o 
+                 SUFFIX png 
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-imgstretch2 EXE ${GUI_BINPATH}
+                 ARGS --imgsize 100,500 -o 
+                 SUFFIX png 
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-camdist EXE ${GUI_BINPATH} 
+                 ARGS --imgsize=500,500 --camera=0,0,0,0,0,0,300  examples/example001.scad -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-camrot EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=0,0,0,10,22.5,45,300  examples/example001.scad -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-camtrans EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=20,100,10,0,0,0,300  examples/example001.scad -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-camortho EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=20,100,10,0,0,0,300  examples/example001.scad --projection=o -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-cameye EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=60,40,30,0,0,0  examples/example001.scad -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-cameye2 EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=160,140,130,0,0,0  examples/example001.scad -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-cameyeortho EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=160,140,130,0,0,0  examples/example001.scad --projection=o -o 
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+add_cmdline_test(openscad-camcenter EXE ${GUI_BINPATH}
+                 ARGS --imgsize=500,500 --camera=60,40,30,20,10,30  -o
+                 SUFFIX png
+                 FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad)
+
+
+
 message("Available test configurations: ${TEST_CONFIGS}")
 #foreach(CONF ${TEST_CONFIGS})
 #  message("${CONF}: ${${CONF}_TEST_CONFIG}")
diff --git a/tests/regression/echotest/value-reassignment-tests-expected.txt b/tests/regression/echotest/value-reassignment-tests-expected.txt
new file mode 100644
index 0000000..05a6741
--- /dev/null
+++ b/tests/regression/echotest/value-reassignment-tests-expected.txt
@@ -0,0 +1 @@
+ECHO: 4
diff --git a/tests/regression/openscad-camcenter/example001-expected.png b/tests/regression/openscad-camcenter/example001-expected.png
new file mode 100644
index 0000000..5cdada7
--- /dev/null
+++ b/tests/regression/openscad-camcenter/example001-expected.png
diff --git a/tests/regression/openscad-camdist/example001-expected.png b/tests/regression/openscad-camdist/example001-expected.png
new file mode 100644
index 0000000..363cc50
--- /dev/null
+++ b/tests/regression/openscad-camdist/example001-expected.png
diff --git a/tests/regression/openscad-cameye/example001-expected.png b/tests/regression/openscad-cameye/example001-expected.png
new file mode 100644
index 0000000..ad7a8b0
--- /dev/null
+++ b/tests/regression/openscad-cameye/example001-expected.png
diff --git a/tests/regression/openscad-cameye2/example001-expected.png b/tests/regression/openscad-cameye2/example001-expected.png
new file mode 100644
index 0000000..0315799
--- /dev/null
+++ b/tests/regression/openscad-cameye2/example001-expected.png
diff --git a/tests/regression/openscad-cameyeortho/example001-expected.png b/tests/regression/openscad-cameyeortho/example001-expected.png
new file mode 100644
index 0000000..0de38bd
--- /dev/null
+++ b/tests/regression/openscad-cameyeortho/example001-expected.png
diff --git a/tests/regression/openscad-camortho/example001-expected.png b/tests/regression/openscad-camortho/example001-expected.png
new file mode 100644
index 0000000..29c1083
--- /dev/null
+++ b/tests/regression/openscad-camortho/example001-expected.png
diff --git a/tests/regression/openscad-camrot/example001-expected.png b/tests/regression/openscad-camrot/example001-expected.png
new file mode 100644
index 0000000..ecfd698
--- /dev/null
+++ b/tests/regression/openscad-camrot/example001-expected.png
diff --git a/tests/regression/openscad-camtrans/example001-expected.png b/tests/regression/openscad-camtrans/example001-expected.png
new file mode 100644
index 0000000..1117751
--- /dev/null
+++ b/tests/regression/openscad-camtrans/example001-expected.png
diff --git a/tests/regression/openscad-imgsize/example001-expected.png b/tests/regression/openscad-imgsize/example001-expected.png
new file mode 100644
index 0000000..52fb547
--- /dev/null
+++ b/tests/regression/openscad-imgsize/example001-expected.png
diff --git a/tests/regression/openscad-imgstretch/example001-expected.png b/tests/regression/openscad-imgstretch/example001-expected.png
new file mode 100644
index 0000000..9d704c8
--- /dev/null
+++ b/tests/regression/openscad-imgstretch/example001-expected.png
diff --git a/tests/regression/openscad-imgstretch2/example001-expected.png b/tests/regression/openscad-imgstretch2/example001-expected.png
new file mode 100644
index 0000000..92a93b6
--- /dev/null
+++ b/tests/regression/openscad-imgstretch2/example001-expected.png
diff --git a/tests/regression/openscad-nonascii/sfære-expected.csg b/tests/regression/openscad-nonascii/sfære-expected.csg
new file mode 100644
index 0000000..e1ee757
--- /dev/null
+++ b/tests/regression/openscad-nonascii/sfære-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
+}
diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py
index 81a7795..eb01abd 100755
--- a/tests/test_cmdline_tool.py
+++ b/tests/test_cmdline_tool.py
@@ -32,17 +32,28 @@ def initialize_environment():
     if not options.generate: options.generate = bool(os.getenv("TEST_GENERATE"))
     return True
 
-def init_expected_filename(testname, cmd):
+def init_expected_filename():
     global expecteddir, expectedfilename
+
+    expected_testname = options.testname
+
     if hasattr(options, "expecteddir"):
-        expected_basename = options.expecteddir
+        expected_dirname = options.expecteddir
     else:
-        expected_basename = os.path.split(cmd)[1]
+        expected_dirname = expected_testname
 
-    expecteddir = os.path.join(options.regressiondir, expected_basename)
-    expectedfilename = os.path.join(expecteddir, testname + "-expected." + options.suffix)
+    expecteddir = os.path.join(options.regressiondir, expected_dirname)
+    expectedfilename = os.path.join(expecteddir, options.filename + "-expected." + options.suffix)
     expectedfilename = os.path.normpath(expectedfilename)
 
+def init_actual_filename():
+    global actualdir, actualfilename
+
+    cmdname = os.path.split(options.cmd)[1]
+    actualdir = os.path.join(os.getcwd(), options.testname + "-output")
+    actualfilename = os.path.join(actualdir, options.filename + "-actual." + options.suffix)
+    actualfilename = os.path.normpath(actualfilename)
+
 def verify_test(testname, cmd):
     global expectedfilename
     if not options.generate:
@@ -133,17 +144,13 @@ def compare_with_expected(resultfilename):
 def run_test(testname, cmd, args):
     cmdname = os.path.split(options.cmd)[1]
 
-    outputdir = os.path.join(os.getcwd(), cmdname + "-output")
-    actualfilename = os.path.join(outputdir, testname + "-actual." + options.suffix)
-    actualfilename = os.path.normpath(actualfilename)
-
     if options.generate: 
         if not os.path.exists(expecteddir): os.makedirs(expecteddir)
         outputname = expectedfilename
     else:
-        if not os.path.exists(outputdir): os.makedirs(outputdir)
+        if not os.path.exists(actualdir): os.makedirs(actualdir)
         outputname = actualfilename
-    outputname = os.path.normpath( outputname )
+    outputname = os.path.normpath(outputname)
 
     outfile = open(outputname, "wb")
 
@@ -154,6 +161,7 @@ def run_test(testname, cmd, args):
             cmdline = ['wine']+[cmd] + args + [outputname]
         else:
             cmdline = [cmd] + args + [outputname]
+        print cmdline
         proc = subprocess.Popen(cmdline, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         errtext = proc.communicate()[1]
         if errtext != None and len(errtext) > 0:
@@ -182,14 +190,15 @@ def usage():
     print >> sys.stderr, "  -g, --generate           Generate expected output for the given tests"
     print >> sys.stderr, "  -s, --suffix=<suffix>    Write -expected and -actual files with the given suffix instead of .txt"
     print >> sys.stderr, "  -e, --expected-dir=<dir> Use -expected files from the given dir (to share files between test drivers)"
-    print >> sys.stderr, "  -t, --test=<name>        Specify test name instead of deducting it from the argument"
+    print >> sys.stderr, "  -t, --test=<name>        Specify test name instead of deducting it from the argument (defaults to basename <exe>)"
+    print >> sys.stderr, "  -f, --file=<name>        Specify test file instead of deducting it from the argument (default to basename <first arg>)"
     print >> sys.stderr, "  -c, --convexec=<name>    Path to ImageMagick 'convert' executable"
     print >> sys.stderr, "  -x, --mingw-cross-env    Mingw-cross-env cross compilation"
 
 if __name__ == '__main__':
     # Handle command-line arguments
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "gs:e:c:t:m:x", ["generate", "convexec=", "suffix=", "expected_dir=", "test=", "comparator=", "mingw-cross-env"])
+        opts, args = getopt.getopt(sys.argv[1:], "gs:e:c:t:f:m:x", ["generate", "convexec=", "suffix=", "expected_dir=", "test=", "file=", "comparator=", "mingw-cross-env"])
     except getopt.GetoptError, err:
         usage()
         sys.exit(2)
@@ -199,6 +208,7 @@ if __name__ == '__main__':
     options.regressiondir = os.path.join(os.path.split(sys.argv[0])[0], "regression")
     options.generate = False
     options.suffix = "txt"
+    options.comparator = ""
 
     for o, a in opts:
         if o in ("-g", "--generate"): options.generate = True
@@ -209,6 +219,8 @@ if __name__ == '__main__':
             options.expecteddir = a
         elif o in ("-t", "--test"):
             options.testname = a
+        elif o in ("-f", "--file"):
+            options.filename = a
         elif o in ("-c", "--convexec"): 
             options.convert_exec = os.path.normpath( a )
         elif o in ("-m", "--comparator"):
@@ -225,16 +237,20 @@ if __name__ == '__main__':
     # If only one test file, we can usually deduct the test name from the file
     if len(args) == 2:
         basename = os.path.splitext(args[1])[0]
-        path, options.testname = os.path.split(basename)
+        path, options.filename = os.path.split(basename)
 
-    if not hasattr(options, "testname"):
-        print >> sys.stderr, "Test name cannot be deducted from arguments. Specify test name using the -t option"
+    if not hasattr(options, "filename"):
+        print >> sys.stderr, "Filename cannot be deducted from arguments. Specify test filename using the -f option"
         sys.exit(2)
 
+    if not hasattr(options, "testname"):
+        options.testname = os.path.split(args[0])[1]
+
     # Initialize and verify run-time environment
     if not initialize_environment(): sys.exit(1)
 
-    init_expected_filename(options.testname, options.cmd)
+    init_expected_filename()
+    init_actual_filename()
 
     # Verify test environment
     verification = verify_test(options.testname, options.cmd)