OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix driver, as POSIX or BSD getopt() stops on first non-option argument.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2021-12-21 18:40:38 +01:00
parent fae1278d82
commit a8665b77d9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/rst_test_driver.sh
View File

@ -7,16 +7,16 @@ deck=$3
pushd $(mktemp -d) pushd $(mktemp -d)
${rst_deck} ${deck} HISTORY:0 output/CASE_COPY.DATA -m copy -s ${rst_deck} -m copy -s ${deck} HISTORY:0 output/CASE_COPY.DATA
${opmhash} ${deck} output/CASE_COPY.DATA -S ${opmhash} -S ${deck} output/CASE_COPY.DATA
${rst_deck} ${deck} HISTORY:0 -m share -s > CASE_STDOUT.DATA ${rst_deck} -m share -s ${deck} HISTORY:0 > CASE_STDOUT.DATA
${opmhash} ${deck} CASE_STDOUT.DATA -S ${opmhash} -S ${deck} CASE_STDOUT.DATA
pushd output pushd output
chmod -R a-w * chmod -R a-w *
popd popd
${rst_deck} output/CASE_COPY.DATA HISTORY:0 output/CASE_SHARE.DATA -m copy -s ${rst_deck} -m copy -s output/CASE_COPY.DATA HISTORY:0 output/CASE_SHARE.DATA
${opmhash} ${deck} output/CASE_SHARE.DATA -S ${opmhash} -S ${deck} output/CASE_SHARE.DATA
popd popd

10
tests/rst_test_driver2.sh
View File

@ -11,11 +11,11 @@ single_rst_file=$6
pushd $(mktemp -d) pushd $(mktemp -d)
# Happy path using unified restart file from source location # Happy path using unified restart file from source location
${rst_deck} ${unif_deck} ${unified_rst_file}:10 output/RESTART_UNIF.DATA -s ${rst_deck} -s ${unif_deck} ${unified_rst_file}:10 output/RESTART_UNIF.DATA
${opmi} output/RESTART_UNIF.DATA ${opmi} output/RESTART_UNIF.DATA
# Happy path using single restart file with absolute path # Happy path using single restart file with absolute path
${rst_deck} ${single_deck} ${single_rst_file} output/RESTART_SINGLE_ABS.DATA -s ${rst_deck} -s ${single_deck} ${single_rst_file} output/RESTART_SINGLE_ABS.DATA
${opmi} output/RESTART_SINGLE_ABS.DATA ${opmi} output/RESTART_SINGLE_ABS.DATA
mkdir rst mkdir rst
@ -23,7 +23,7 @@ cp ${single_rst_file} rst/.
single_rst_file="$(basename -- ${single_rst_file})" single_rst_file="$(basename -- ${single_rst_file})"
# Happy path using single restart file wth relative path from rst/ # Happy path using single restart file wth relative path from rst/
${rst_deck} ${single_deck} rst/${single_rst_file} output/RESTART_SINGLE_RELATIVE.DATA -s ${rst_deck} -s ${single_deck} rst/${single_rst_file} output/RESTART_SINGLE_RELATIVE.DATA
${opmi} output/RESTART_SINGLE_RELATIVE.DATA ${opmi} output/RESTART_SINGLE_RELATIVE.DATA
@ -40,11 +40,11 @@ set +e
# Test two error conditions # Test two error conditions
# Deck with UNIFIN and pass a single .X0010 restart file # Deck with UNIFIN and pass a single .X0010 restart file
${rst_deck} ${unif_deck} rst/${single_rst_file} output/RESTART_SINGLE_RELATIVE.DATA -s ${rst_deck} -s ${unif_deck} rst/${single_rst_file} output/RESTART_SINGLE_RELATIVE.DATA
assert_error assert_error
# Ask for wrong restart number from unified restart file # Ask for wrong restart number from unified restart file
${rst_deck} ${unif_deck} ${unified_rst_file}:20 output/RESTART_ERROR.DATA -s ${rst_deck} -s ${unif_deck} ${unified_rst_file}:20 output/RESTART_ERROR.DATA
${opmi} output/RESTART_ERROR.DATA ${opmi} output/RESTART_ERROR.DATA
assert_error assert_error