Skip to content

Commit

Permalink
add date to build.sh; remove missing yamls from test CMakeLists.txt (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
RussTreadon-NOAA committed Oct 10, 2024
1 parent 9d95c9d commit ca4ceca
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 21 deletions.
18 changes: 11 additions & 7 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

set -eu

echo "Start ... `date`"
dir_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

source $dir_root/ush/detect_machine.sh
Expand Down Expand Up @@ -113,34 +114,37 @@ if [[ $BUILD_TARGET == 'hera' ]]; then
fi

# Configure
echo "Configuring ..."
echo "Configuring ... `date`"
set -x
cmake \
${CMAKE_OPTS:-} \
$dir_root/bundle
set +x

# Build
echo "Building ..."
echo "Building ... `date`"
set -x
if [[ $BUILD_JCSDA == 'YES' ]]; then
make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
make -j ${BUILD_JOBS:-8} VERBOSE=$BUILD_VERBOSE
else
builddirs="gdas iodaconv land-imsproc land-jediincr gdas-utils bufr-query da-utils"
for b in $builddirs; do
cd $b
make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
set +x
echo "Building $b ... `date`"
set -x
make -j ${BUILD_JOBS:-8} VERBOSE=$BUILD_VERBOSE
cd ../
done
fi
set +x

# Install
if [[ -n ${INSTALL_PREFIX:-} ]]; then
echo "Installing ..."
echo "Installing ... `date`"
set -x
make install
make install -j ${BUILD_JOBS:-8}
set +x
fi

echo "Finish ... `date`"
exit 0
14 changes: 0 additions & 14 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,6 @@ list(APPEND test_input
${PROJECT_SOURCE_DIR}/test/testinput/check_yaml_keys_test.yaml
${PROJECT_SOURCE_DIR}/test/testinput/bufr_adpsfc.yaml
${PROJECT_SOURCE_DIR}/test/testinput/bufr_adpsfc_snow.yaml
${PROJECT_SOURCE_DIR}/test/testinput/amsua_n19_ewok.yaml
${PROJECT_SOURCE_DIR}/test/testinput/temp_bufr_dbuoyprof.yaml
${PROJECT_SOURCE_DIR}/test/testinput/salt_bufr_dbuoyprof.yaml
${PROJECT_SOURCE_DIR}/test/testinput/temp_bufr_mbuoybprof.yaml
${PROJECT_SOURCE_DIR}/test/testinput/salt_bufr_mbuoybprof.yaml
${PROJECT_SOURCE_DIR}/test/testinput/bufr_tesacprof.yaml
${PROJECT_SOURCE_DIR}/test/testinput/bufr_trkobprof.yaml
${PROJECT_SOURCE_DIR}/test/testinput/bufr_sfcships.yaml
${PROJECT_SOURCE_DIR}/test/testinput/bufr_sfcshipsu.yaml
)

# create testinput dir
Expand All @@ -87,11 +78,6 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test/testoutput)
# create testreference dir
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test/testreference)

# list of test reference files to install
list(APPEND test_reference
${PROJECT_SOURCE_DIR}/test/testreference/amsua_n19_gdas.yaml
)

# symlink
foreach(FILENAME ${test_reference})
file(RELATIVE_PATH FILENAME_REL ${PROJECT_SOURCE_DIR}/test/testreference/ ${FILENAME})
Expand Down

0 comments on commit ca4ceca

Please sign in to comment.