Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

testsuite overhaul -- all temp files end up in build, runtest.py call…

…ed directly and the run.py files shrink down to the bare minimum. Similar to the recent changes in OIIO testsuite.
  • Loading branch information...
commit fc7b1a50b690ccaa20525c24a81d6d612defc8c8 1 parent 12f821f
@lgritz lgritz authored
Showing with 338 additions and 2,347 deletions.
  1. +1 −9 .gitignore
  2. +16 −11 Makefile
  3. +36 −6 src/CMakeLists.txt
  4. +0 −71 src/cmake/CMakeUserUseBison.cmake
  5. +0 −46 src/cmake/CMakeUserUseFlex.cmake
  6. +0 −7 src/cmake/oiio.cmake
  7. +8 −0 src/doc/.gitignore
  8. +1 −25 testsuite/arithmetic/run.py
  9. +1 −25 testsuite/array-derivs/run.py
  10. +1 −26 testsuite/array-range/run.py
  11. +1 −25 testsuite/array/run.py
  12. +3 −0  testsuite/blackbody/ref/out.txt
  13. +2 −25 testsuite/blackbody/run.py
  14. +1 −25 testsuite/blendmath/run.py
  15. +1 −25 testsuite/breakcont/run.py
  16. +1 −25 testsuite/bug-locallifetime/run.py
  17. +1 −25 testsuite/cellnoise/run.py
  18. +1 −25 testsuite/closure/run.py
  19. +1 −25 testsuite/color/run.py
  20. +1 −25 testsuite/comparison/run.py
  21. +1 −26 testsuite/component-range/run.py
  22. +1 −25 testsuite/const-array-params/run.py
  23. +1 −0  testsuite/debugnan/ref/out.txt
  24. +1 −25 testsuite/debugnan/run.py
  25. +1 −25 testsuite/derivs-muldiv-clobber/run.py
  26. +1 −25 testsuite/derivs/run.py
  27. +1 −25 testsuite/error-dupes/run.py
  28. +1 −25 testsuite/exponential/run.py
  29. +1 −25 testsuite/function-earlyreturn/run.py
  30. +1 −25 testsuite/function-outputelem/run.py
  31. +1 −25 testsuite/function-simple/run.py
  32. +1 −25 testsuite/geomath/run.py
  33. +2 −25 testsuite/getsymbol-nonheap/run.py
  34. +1 −0  testsuite/gettextureinfo/ref/out.txt
  35. +1 −25 testsuite/gettextureinfo/run.py
  36. +1 −25 testsuite/hyperb/run.py
  37. +1 −25 testsuite/ieee_fp/run.py
  38. +1 −25 testsuite/if/run.py
  39. +1 −25 testsuite/incdec/run.py
  40. +1 −25 testsuite/initops/run.py
  41. +1 −25 testsuite/intbits/run.py
  42. +1 −27 testsuite/layers-lazy/run.py
  43. +1 −26 testsuite/layers/run.py
  44. +1 −26 testsuite/lazyglobals/run.py
  45. +1 −25 testsuite/logic/run.py
  46. +1 −25 testsuite/loop/run.py
  47. +1 −0  testsuite/matrix/ref/out.txt
  48. +1 −25 testsuite/matrix/run.py
  49. +1 −26 testsuite/message/run.py
  50. +1 −25 testsuite/miscmath/run.py
  51. +5 −0 testsuite/missing-shader/ref/out.txt
  52. +1 −24 testsuite/missing-shader/run.py
  53. +2 −26 testsuite/noise-cell/run.py
  54. +5 −26 testsuite/noise-gabor/run.py
  55. +4 −25 testsuite/noise-gabor2d-filter/run.py
  56. +4 −25 testsuite/noise-gabor3d-filter/run.py
  57. +5 −26 testsuite/noise-perlin/run.py
  58. +5 −26 testsuite/noise-uperlin/run.py
  59. +4 −25 testsuite/noise/run.py
  60. +1 −24 testsuite/oslc-empty/run.py
  61. +3 −24 testsuite/oslc-err-noreturn/run.py
  62. +3 −24 testsuite/oslc-err-paramdefault/run.py
  63. +2 −26 testsuite/pnoise-cell/run.py
  64. +2 −26 testsuite/pnoise-gabor/run.py
  65. +2 −26 testsuite/pnoise-perlin/run.py
  66. +2 −26 testsuite/pnoise-uperlin/run.py
  67. +1 −25 testsuite/pnoise/run.py
  68. +1 −25 testsuite/raytype/run.py
  69. +0 −18 testsuite/run-template.py
  70. +140 −30 testsuite/runtest.py
  71. +1 −25 testsuite/shortcircuit/run.py
  72. +2 −25 testsuite/spline-nonuniformknots/run.py
  73. +1 −23 testsuite/spline/run.py
  74. +1 −25 testsuite/splineinverse/run.py
  75. +1 −25 testsuite/string/run.py
  76. +1 −25 testsuite/struct-array-mixture/run.py
  77. +1 −25 testsuite/struct-array/run.py
  78. +3 −24 testsuite/struct-err/run.py
  79. +1 −26 testsuite/struct-layers/run.py
  80. +1 −25 testsuite/struct-with-array/run.py
  81. +1 −25 testsuite/struct-within-struct/run.py
  82. +1 −25 testsuite/struct/run.py
  83. +1 −25 testsuite/ternary/run.py
  84. +1 −24 testsuite/texture-alpha/run.py
  85. +1 −24 testsuite/texture-blur/run.py
  86. +1 −24 testsuite/texture-field3d/run.py
  87. +1 −24 testsuite/texture-firstchannel/run.py
  88. +1 −24 testsuite/texture-interp/run.py
  89. +1 −24 testsuite/texture-simple/run.py
  90. +1 −24 testsuite/texture-width/run.py
  91. +1 −24 testsuite/texture-withderivs/run.py
  92. +1 −23 testsuite/texture-wrap/run.py
  93. +1 −25 testsuite/transform/run.py
  94. +1 −25 testsuite/transformc/run.py
  95. +1 −25 testsuite/trig/run.py
  96. +1 −25 testsuite/typecast/run.py
  97. +1 −25 testsuite/vecctr/run.py
  98. +1 −25 testsuite/vector/run.py
  99. +3 −0  testsuite/wavelength_color/ref/out.txt
  100. +2 −25 testsuite/wavelength_color/run.py
  101. +1 −0  testsuite/xml/ref/out.txt
  102. +1 −25 testsuite/xml/run.py
View
10 .gitignore
@@ -1,14 +1,6 @@
dist
build
-*.aux
-*.adx
-*.ind
-*.log
-*.out
-*.toc
-*.idx
-*.ilg
*~
\#*\#
*.pyc
-testsuite/*/*.oso
+*.log
View
27 Makefile
@@ -40,6 +40,7 @@ endif
ifneq (${VERBOSE},)
MY_MAKE_FLAGS += VERBOSE=${VERBOSE}
+TEST_FLAGS += -V
endif
ifneq (${USE_TBB},)
@@ -69,6 +70,10 @@ ifneq (${MYCXX},)
MY_CMAKE_FLAGS += -DCMAKE_CXX_COMPILER:STRING=${MYCXX}
endif
+ifneq (${TEST},)
+TEST_FLAGS += -R ${TEST}
+endif
+
#$(info MY_CMAKE_FLAGS = ${MY_CMAKE_FLAGS})
#$(info MY_MAKE_FLAGS = ${MY_MAKE_FLAGS})
@@ -127,8 +132,15 @@ cmakeinstall: cmake
dist : cmakeinstall
# 'make test' does a full build and then runs all tests
-test: cmakeinstall
- ( cd ${build_dir} ; ${MAKE} ${MY_MAKE_FLAGS} test )
+test: cmake
+ cmake -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests ${TEST_FLAGS}..."
+ ( cd ${build_dir} ; ctest --force-new-ctest-process ${TEST_FLAGS} -E broken )
+
+# 'make testall' does a full build and then runs all tests (even the ones
+# that are expected to fail on some platforms)
+testall: cmake
+ cmake -E cmake_echo_color --switch=$(COLOR) --cyan "Running all tests ${TEST_FLAGS}..."
+ ( cd ${build_dir} ; ctest --force-new-ctest-process ${TEST_FLAGS} )
# 'make package' builds everything and then makes an installable package
# (platform dependent -- may be .tar.gz, .sh, .dmg, .rpm, .deb. .exe)
@@ -157,14 +169,6 @@ nuke:
doxygen:
doxygen src/doc/Doxyfile
-#testclean : ${all_tests}
-# @ for f in ${all_tests} ; do \
-# ( cd $$f ; \
-# echo "Cleaning test $$f " ; \
-# ./run.py -c ; \
-# ) \
-# done
-
#########################################################################
@@ -181,7 +185,8 @@ help:
@echo " make clean Remove the temporary files in ${build_dir}"
@echo " make realclean Remove both ${build_dir} AND ${dist_dir}"
@echo " make nuke Remove ALL of build and dist (not just ${platform})"
- @echo " make test Run all tests"
+ @echo " make test Run tests"
+ @echo " make testall Run all tests, even broken ones"
@echo " make doxygen Build the Doxygen docs in ${top_build_dir}/doxygen"
@echo ""
@echo "Helpful modifiers:"
View
42 src/CMakeLists.txt
@@ -89,9 +89,6 @@ include_directories (
)
-# We want CTest for testing
-include (CTest)
-
include_directories ("include")
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -143,13 +140,46 @@ add_subdirectory (doc)
#########################################################################
# Testing
+# We want CTest for testing
+include (CTest)
+
+# Make a copy of the testsuite into the build area
+if (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS 2.8)
+ file (COPY ${PROJECT_SOURCE_DIR}/../testsuite
+ DESTINATION ${CMAKE_BINARY_DIR})
+endif()
+
macro ( TESTSUITE )
- foreach (_testname ${ARGN})
+ parse_arguments (_ats "LABEL" "" ${ARGN})
+ # If there was a FOUNDVAR param specified and that variable name is
+ # not defined, mark the test as broken.
+ if (_ats_FOUNDVAR AND NOT ${_ats_FOUNDVAR})
+ set (_ats_LABEL "broken")
+ endif ()
+ # Add the tests if all is well.
+ foreach (_testname ${_ats_DEFAULT_ARGS})
+ set (_testdir "${CMAKE_BINARY_DIR}/testsuite/${_testname}")
+ if (_ats_LABEL MATCHES "broken")
+ set (_testname "${_testname}-broken")
+ endif ()
+ set (_runtest python ${CMAKE_BINARY_DIR}/testsuite/runtest.py
+ ${_testdir} ${_extra_test_args})
+ if (MSVC_IDE)
+ set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
+ --solution-path "${CMAKE_BINARY_DIR}" )
+ endif ()
+
+ message (STATUS "TEST ${_testname}: ${CMAKE_BINARY_DIR}/testsuite/runtest.py ${_testdir} ${_extra_test_args}")
+
# Run the test unoptimized
- add_test ( ${_testname} env OPENIMAGEIOHOME=${OPENIMAGEIOHOME} TESTSHADE_OPT=0 python ${PROJECT_SOURCE_DIR}/../testsuite/${_testname}/run.py ${PROJECT_SOURCE_DIR}/../testsuite/${_testname} ${CMAKE_BINARY_DIR} )
+ set (_env TESTSHADE_OPT=0 OPENIMAGEIOHOME=${OPENIMAGEIOHOME})
+ add_test ( NAME ${_testname}
+ COMMAND env ${_env} ${_runtest} )
# Run the same test again with aggressive -O2 runtime
# optimization, triggered by setting TESTSHADE_OPT env variable
- add_test ( ${_testname}.opt env OPENIMAGEIOHOME=${OPENIMAGEIOHOME} TESTSHADE_OPT=2 python ${PROJECT_SOURCE_DIR}/../testsuite/${_testname}/run.py ${PROJECT_SOURCE_DIR}/../testsuite/${_testname} ${CMAKE_BINARY_DIR} )
+ set (_env TESTSHADE_OPT=2 OPENIMAGEIOHOME=${OPENIMAGEIOHOME})
+ add_test ( NAME ${_testname}.opt
+ COMMAND env ${_env} ${_runtest} )
endforeach ()
endmacro ()
View
71 src/cmake/CMakeUserUseBison.cmake
@@ -1,71 +0,0 @@
-# - Look for GNU Bison, the parser generator
-# Based off a news post from Andy Cedilnik at Kitware
-# Defines the following:
-# BISON_EXECUTABLE - path to the bison executable
-# BISON_FILE - parse a file with bison
-# BISON_PREFIX_OUTPUTS - Set to true to make BISON_FILE produce prefixed
-# symbols in the generated output based on filename.
-# So for ${filename}.y, you'll get ${filename}parse(), etc.
-# instead of yyparse().
-# BISON_GENERATE_DEFINES - Set to true to make BISON_FILE output the matching
-# .h file for a .c file. You want this if you're using
-# flex.
-
-IF(NOT DEFINED BISON_PREFIX_OUTPUTS)
- SET(BISON_PREFIX_OUTPUTS FALSE)
-ENDIF(NOT DEFINED BISON_PREFIX_OUTPUTS)
-
-IF(NOT DEFINED BISON_GENERATE_DEFINES)
- SET(BISON_GENERATE_DEFINES FALSE)
-ENDIF(NOT DEFINED BISON_GENERATE_DEFINES)
-
-IF(NOT BISON_EXECUTABLE)
- MESSAGE(STATUS "Looking for bison")
- FIND_PROGRAM(BISON_EXECUTABLE bison)
- IF(BISON_EXECUTABLE)
- MESSAGE(STATUS "Looking for bison -- ${BISON_EXECUTABLE}")
- ENDIF(BISON_EXECUTABLE)
-ENDIF(NOT BISON_EXECUTABLE)
-
-IF(BISON_EXECUTABLE)
- MACRO(BISON_FILE FILENAME)
- GET_FILENAME_COMPONENT(PATH "${FILENAME}" PATH)
- IF("${PATH}" STREQUAL "")
- SET(PATH_OPT "")
- ELSE("${PATH}" STREQUAL "")
- SET(PATH_OPT "/${PATH}")
- ENDIF("${PATH}" STREQUAL "")
- GET_FILENAME_COMPONENT(HEAD "${FILENAME}" NAME_WE)
- IF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}")
- FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}")
- ENDIF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}")
- IF(BISON_PREFIX_OUTPUTS)
- SET(PREFIX "${HEAD}")
- ELSE(BISON_PREFIX_OUTPUTS)
- SET(PREFIX "yy")
- ENDIF(BISON_PREFIX_OUTPUTS)
- SET(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}/${HEAD}.tab.c")
- IF(BISON_GENERATE_DEFINES)
- SET(HEADER "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}/${HEAD}.tab.h")
- ADD_CUSTOM_COMMAND(
- OUTPUT "${OUTFILE}" "${HEADER}"
- COMMAND "${BISON_EXECUTABLE}"
- ARGS "--name-prefix=${PREFIX}"
- "--defines"
- "--output-file=${OUTFILE}"
- "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
- SET_SOURCE_FILES_PROPERTIES("${OUTFILE}" "${HEADER}" PROPERTIES GENERATED TRUE)
- SET_SOURCE_FILES_PROPERTIES("${HEADER}" PROPERTIES HEADER_FILE_ONLY TRUE)
- ELSE(BISON_GENERATE_DEFINES)
- ADD_CUSTOM_COMMAND(
- OUTPUT "${OUTFILE}"
- COMMAND "${BISON_EXECUTABLE}"
- ARGS "--name-prefix=${PREFIX}"
- "--output-file=${OUTFILE}"
- "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
- SET_SOURCE_FILES_PROPERTIES("${OUTFILE}" PROPERTIES GENERATED TRUE)
- ENDIF(BISON_GENERATE_DEFINES)
- ENDMACRO(BISON_FILE)
-ENDIF(BISON_EXECUTABLE)
View
46 src/cmake/CMakeUserUseFlex.cmake
@@ -1,46 +0,0 @@
-# - Look for GNU flex, the lexer generator.
-# Defines the following:
-# FLEX_EXECUTABLE - path to the flex executable
-# FLEX_FILE - parse a file with flex
-# FLEX_PREFIX_OUTPUTS - Set to true to make FLEX_FILE produce outputs of
-# lex.${filename}.c, not lex.yy.c . Passes -P to flex.
-
-IF(NOT DEFINED FLEX_PREFIX_OUTPUTS)
- SET(FLEX_PREFIX_OUTPUTS FALSE)
-ENDIF(NOT DEFINED FLEX_PREFIX_OUTPUTS)
-
-IF(NOT FLEX_EXECUTABLE)
- MESSAGE(STATUS "Looking for flex")
- FIND_PROGRAM(FLEX_EXECUTABLE flex)
- IF(FLEX_EXECUTABLE)
- MESSAGE(STATUS "Looking for flex -- ${FLEX_EXECUTABLE}")
- ENDIF(FLEX_EXECUTABLE)
-ENDIF(NOT FLEX_EXECUTABLE)
-
-IF(FLEX_EXECUTABLE)
- MACRO(FLEX_FILE FILENAME)
- GET_FILENAME_COMPONENT(PATH "${FILENAME}" PATH)
- IF("${PATH}" STREQUAL "")
- SET(PATH_OPT "")
- ELSE("${PATH}" STREQUAL "")
- SET(PATH_OPT "/${PATH}")
- ENDIF("${PATH}" STREQUAL "")
- IF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}")
- FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}")
- ENDIF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}")
- IF(FLEX_PREFIX_OUTPUTS)
- GET_FILENAME_COMPONENT(PREFIX "${FILENAME}" NAME_WE)
- ELSE(FLEX_PREFIX_OUTPUTS)
- SET(PREFIX "yy")
- ENDIF(FLEX_PREFIX_OUTPUTS)
- SET(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}${PATH_OPT}/lex.${PREFIX}.c")
- ADD_CUSTOM_COMMAND(
- OUTPUT "${OUTFILE}"
- COMMAND "${FLEX_EXECUTABLE}"
- ARGS "--prefix=${PREFIX}"
- "--outfile=${OUTFILE}"
- "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
- SET_SOURCE_FILES_PROPERTIES("${OUTFILE}" PROPERTIES GENERATED TRUE)
- ENDMACRO(FLEX_FILE)
-ENDIF(FLEX_EXECUTABLE)
View
7 src/cmake/oiio.cmake
@@ -21,13 +21,6 @@ IF (OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY )
SET ( OPENIMAGEIO_FOUND TRUE )
MESSAGE ( STATUS "OpenImageIO includes = ${OPENIMAGEIO_INCLUDES}" )
MESSAGE ( STATUS "OpenImageIO library = ${OPENIMAGEIO_LIBRARY}" )
- MESSAGE ( STATUS "OpenImageIO namespace = ${OPENIMAGEIO_NAMESPACE}" )
- if (OPENIMAGEIO_NAMESPACE)
- add_definitions ("-DOPENIMAGEIO_NAMESPACE=${OPENIMAGEIO_NAMESPACE}")
- endif ()
-# N.B. -- once we're confident that we only build against OIIO >= 0.9.x,
-# specifically versions after we did the big namespace change, then we
-# can completely eliminate the 'OPENIMAGEIO_NAMESPACE' parts above.
ELSE ()
MESSAGE ( STATUS "OpenImageIO not found" )
ENDIF ()
View
8 src/doc/.gitignore
@@ -0,0 +1,8 @@
+*.aux
+*.adx
+*.ind
+*.log
+*.out
+*.toc
+*.idx
+*.ilg
View
26 testsuite/arithmetic/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/array-derivs/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
27 testsuite/array-range/run.py
@@ -1,28 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out1.txt"
-command = command + "; " + path + "testshade/testshade test >& out2.txt"
-command = command + "; cat out1.txt out2.txt > out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("test")
View
26 testsuite/array/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
3  testsuite/blackbody/ref/out.txt
@@ -0,0 +1,3 @@
+Compiled test.osl -> test.oso
+
+Output Cout to out.exr
View
27 testsuite/blackbody/run.py
@@ -1,27 +1,4 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 1000 64 -od float -o Cout out.exr test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.exr" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "out.txt" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command += testshade ("-g 1000 64 -od float -o Cout out.exr test")
+outputs += [ "out.exr" ]
View
26 testsuite/blendmath/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/breakcont/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("test")
View
26 testsuite/bug-locallifetime/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -O2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("test")
View
26 testsuite/cellnoise/run.py
@@ -1,28 +1,4 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif test >> out.txt"
-
-# Outputs to check against references
+command = testshade("-g 512 512 -od uint8 -o Cout out.tif test")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
26 testsuite/closure/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/color/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/comparison/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
27 testsuite/component-range/run.py
@@ -1,28 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out1.txt"
-command = command + "; " + path + "testshade/testshade test >& out2.txt"
-command = command + "; cat out1.txt out2.txt > out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("test")
View
26 testsuite/const-array-params/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -O2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("test")
View
1  testsuite/debugnan/ref/out.txt
@@ -1,2 +1,3 @@
+Compiled test.osl -> test.oso
ERROR: Detected nan value in Cout at test.osl:5
View
26 testsuite/debugnan/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade --debugnan -g 2 2 test >& out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("--debugnan -g 2 2 test")
View
26 testsuite/derivs-muldiv-clobber/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("test")
View
26 testsuite/derivs/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/error-dupes/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt 2>>out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/exponential/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/function-earlyreturn/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/function-outputelem/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/function-simple/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/geomath/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
27 testsuite/getsymbol-nonheap/run.py
@@ -1,27 +1,4 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -od half -o a a.exr -o b b.exr -o c c.exr -g 64 64 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "a.exr", "b.exr", "c.exr" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "out.txt" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-od half -o a a.exr -o b b.exr -o c c.exr -g 64 64 test")
+outputs = [ "a.exr", "b.exr", "c.exr", "out.txt" ]
View
1  testsuite/gettextureinfo/ref/out.txt
@@ -1,3 +1,4 @@
+Compiled test.osl -> test.oso
Executing...
../common/textures/grid.tx resolution: 1024 1024 (1)
../common/textures/grid.tx channels: 4 (1)
View
26 testsuite/gettextureinfo/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 -O2 test >& out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/hyperb/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/ieee_fp/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/if/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/incdec/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/initops/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 3 3 --fparam a 10 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 3 3 --fparam a 10 test")
View
26 testsuite/intbits/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
28 testsuite/layers-lazy/run.py
@@ -1,29 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc a.osl > out.txt"
-command = command + "; " + path + "oslc/oslc b.osl >> out.txt"
-command = command + "; " + path + "oslc/oslc c.osl >> out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 -layer alayer a -layer blayer b --layer clayer c --connect alayer f_out clayer f_in --connect alayer c_out clayer c_in --connect blayer out clayer unused >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command += testshade("-g 2 2 -layer alayer a -layer blayer b --layer clayer c --connect alayer f_out clayer f_in --connect alayer c_out clayer c_in --connect blayer out clayer unused")
View
27 testsuite/layers/run.py
@@ -1,28 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc a.osl > out.txt"
-command = command + "; " + path + "oslc/oslc b.osl >> out.txt"
-command = command + "; " + path + "testshade/testshade -layer alayer a --layer blayer b --connect alayer f_out blayer f_in --connect alayer c_out blayer c_in >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command += testshade("-layer alayer a --layer blayer b --connect alayer f_out blayer f_in --connect alayer c_out blayer c_in")
View
27 testsuite/lazyglobals/run.py
@@ -1,28 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc changeuv.osl > out.txt"
-command = command + "; " + path + "oslc/oslc printuv.osl >> out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 changeuv printuv >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command += testshade("-g 2 2 changeuv printuv")
View
26 testsuite/logic/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
26 testsuite/loop/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
1  testsuite/matrix/ref/out.txt
@@ -25,6 +25,7 @@ Testing matrix from-to construction:
matrix ("object", "shader") = (0.70711 0.70711 0 0 -0.70711 0.70711 0 0 0 0 1 0 0 1.4142 0 1)
Testing getmatrix for unknown space name:
+ERROR: Unknown transformation "foobar"
'foobar' matrix not found, as expected
View
26 testsuite/matrix/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
27 testsuite/message/run.py
@@ -1,28 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc a.osl > out.txt"
-command = command + "; " + path + "oslc/oslc b.osl >> out.txt"
-command = command + "; " + path + "testshade/testshade -layer alayer a --layer blayer b --connect alayer f_out blayer f_in --connect alayer c_out blayer c_in --connect alayer dummy blayer dummy >> out.txt 2>&1"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "a.oso", "b.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command += testshade ("-layer alayer a --layer blayer b --connect alayer f_out blayer f_in --connect alayer c_out blayer c_in --connect alayer dummy blayer dummy")
View
26 testsuite/miscmath/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 2 2 test >> out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = testshade("-g 2 2 test")
View
5 testsuite/missing-shader/ref/out.txt
@@ -1,2 +1,7 @@
+ERROR: No .oso file could be found for shader "foo"
+ERROR: Could not find shader "foo"
+ERROR: No .oso file could be found for shader "bar"
+ERROR: Could not find shader "bar"
+ERROR: ConnectShaders: source layer "lay1" not found
Connect lay1.x to lay2.y
View
25 testsuite/missing-shader/run.py
@@ -1,26 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "testshade/testshade -g 2 2 --layer lay1 foo --layer lay2 bar --connect lay1 x lay2 y > out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failureok=1)
-sys.exit (ret)
+command = testshade("-g 2 2 --layer lay1 foo --layer lay2 bar --connect lay1 x lay2 y")
View
28 testsuite/noise-cell/run.py
@@ -1,29 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename cell -fparam offset 0 -fparam scale 1 testnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testnoise.osl")
+command += testshade ("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename cell -fparam offset 0 -fparam scale 1 testnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "testnoise.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
31 testsuite/noise-gabor/run.py
@@ -1,29 +1,8 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename gabor testnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testnoise.osl")
+command += testshade ("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename gabor testnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "testnoise.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
+# expect a few LSB failures
+failthresh = 0.004
+failpercent = 0.05
View
29 testsuite/noise-gabor2d-filter/run.py
@@ -1,28 +1,7 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif test >> out.txt"
-
-# Outputs to check against references
+command += testshade("-g 512 512 -od uint8 -o Cout out.tif test")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "test.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
+# expect a few LSB failures
+failthresh = 0.004
+failpercent = 0.05
View
29 testsuite/noise-gabor3d-filter/run.py
@@ -1,28 +1,7 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif test >> out.txt"
-
-# Outputs to check against references
+command += testshade ("-g 512 512 -od uint8 -o Cout out.tif test")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "test.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
+# expect a few LSB failures
+failthresh = 0.004
+failpercent = 0.05
View
31 testsuite/noise-perlin/run.py
@@ -1,29 +1,8 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename perlin testnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testnoise.osl")
+command += testshade ("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename perlin testnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "testnoise.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
+# expect some LSB failures on this test
+failthresh = 0.004
+failpercent = 0.05
View
31 testsuite/noise-uperlin/run.py
@@ -1,29 +1,8 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename uperlin -fparam offset 0 -fparam scale 1 testnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testnoise.osl")
+command += testshade ("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename uperlin -fparam offset 0 -fparam scale 1 testnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ "testnoise.oso" ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
+# expect some LSB failures on this test
+failthresh = 0.004
+failpercent = 0.05
View
29 testsuite/noise/run.py
@@ -1,28 +1,7 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif test >> out.txt"
-
-# Outputs to check against references
+command += testshade ("-g 512 512 -od uint8 -o Cout out.tif test")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
+# expect a few LSB failures
+failthresh = 0.004
+failpercent = 0.05
View
25 testsuite/oslc-empty/run.py
@@ -1,26 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc -d test.osl > out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = ["../.."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles)
-sys.exit (ret)
+command = oslc("-d test.osl")
View
27 testsuite/oslc-err-noreturn/run.py
@@ -1,26 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl >& out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failureok=1)
-sys.exit (ret)
+# command = oslc("test.osl")
+# don't even need that -- it's automatic
+failureok = 1 # this test is expected to have oslc errors
View
27 testsuite/oslc-err-paramdefault/run.py
@@ -1,26 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl >& out.txt"
-
-# Outputs to check against references
-outputs = [ "out.txt" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failureok=1)
-sys.exit (ret)
+# command = oslc("test.osl")
+# don't even need that -- it's automatic
+failureok = 1 # this test is expected to have oslc errors
View
28 testsuite/pnoise-cell/run.py
@@ -1,29 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testpnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename cell -fparam offset 0 -fparam scale 1 testpnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testpnoise.osl")
+command += testshade("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename cell -fparam offset 0 -fparam scale 1 testpnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
28 testsuite/pnoise-gabor/run.py
@@ -1,29 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testpnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename gabor testpnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testpnoise.osl")
+command += testshade("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename gabor testpnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
28 testsuite/pnoise-perlin/run.py
@@ -1,29 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testpnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename perlin testpnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testpnoise.osl")
+command += testshade("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename perlin testpnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
28 testsuite/pnoise-uperlin/run.py
@@ -1,29 +1,5 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc ../common/shaders/testpnoise.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif "
-command = command + "-sparam noisename uperlin -fparam offset 0 -fparam scale 1 testpnoise >> out.txt"
-
-# Outputs to check against references
+command = oslc("../common/shaders/testpnoise.osl")
+command += testshade("-g 512 512 -od uint8 -o Cout out.tif -sparam noisename uperlin -fparam offset 0 -fparam scale 1 testpnoise")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
26 testsuite/pnoise/run.py
@@ -1,28 +1,4 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade -g 512 512 -od uint8 "
-command = command + "-o Cout out.tif test >> out.txt"
-
-# Outputs to check against references
+command += testshade("-g 512 512 -od uint8 -o Cout out.tif test")
outputs = [ "out.txt", "out.tif" ]
-
-# Files that need to be cleaned up, IN ADDITION to outputs
-cleanfiles = [ ]
-
-
-# boilerplate
-sys.path = [".."] + sys.path
-import runtest
-ret = runtest.runtest (command, outputs, cleanfiles, failthresh=0.004, failpercent=.05)
-sys.exit (ret)
View
26 testsuite/raytype/run.py
@@ -1,27 +1,3 @@
#!/usr/bin/python
-import os
-import sys
-
-path = ""
-command = ""
-if len(sys.argv) > 2 :
- os.chdir (sys.argv[1])
- path = sys.argv[2] + "/"
-
-# A command to run
-command = path + "oslc/oslc test.osl > out.txt"
-command = command + "; " + path + "testshade/testshade --raytype glossy test >> out.txt"