From: <ai...@us...> - 2013-09-29 10:21:57
|
Revision: 12547 http://sourceforge.net/p/plplot/code/12547 Author: airwin Date: 2013-09-29 10:21:53 +0000 (Sun, 29 Sep 2013) Log Message: ----------- Adjust script so that it can handle version numbers where the major number is one numerical digit, the minor number one or more numerical digits, and the patch number is one or more numerical digits. Modified Paths: -------------- trunk/scripts/comprehensive_test.sh Modified: trunk/scripts/comprehensive_test.sh =================================================================== --- trunk/scripts/comprehensive_test.sh 2013-09-29 08:17:29 UTC (rev 12546) +++ trunk/scripts/comprehensive_test.sh 2013-09-29 10:21:53 UTC (rev 12547) @@ -138,7 +138,7 @@ # Use this logic to be as version-independent as possible. current_dir=$(pwd) # Wild cards must not be inside quotes. - cd "$INSTALL_TREE"/lib/plplot?.?.?*/drivers* + cd "$INSTALL_TREE"/lib/plplot[0-9].[0-9]*.[0-9]*/drivers* PATH="$(pwd):$PATH" cd $current_dir fi @@ -156,7 +156,7 @@ # that excludes MSYS. PATH=$path_excluding_msys fi - cmake -G "$generator_string" "$INSTALL_TREE"/share/plplot?.?.?/examples >& "$output" + cmake -G "$generator_string" "$INSTALL_TREE"/share/plplot[0-9].[0-9]*.[0-9]*/examples >& "$output" PATH=$PATH_AFTER_CMAKE if [ "$do_test_noninteractive" = "yes" ] ; then output="$OUTPUT_TREE"/installed_make_noninteractive.out @@ -173,7 +173,7 @@ fi if [ "$do_test_traditional_install_tree" = "yes" -a "$do_test_noninteractive" = "yes" ] ; then - cd "$INSTALL_TREE"/share/plplot?.?.?/examples + cd "$INSTALL_TREE"/share/plplot[0-9].[0-9]*.[0-9]*/examples output="$OUTPUT_TREE"/traditional_make_noninteractive.out rm -f "$output" echo "Traditional $build_command test_noninteractive in the installed examples tree" @@ -217,7 +217,7 @@ fi fi if [ "$do_test_traditional_install_tree" = "yes" ] ; then - cd "$INSTALL_TREE"/share/plplot?.?.?/examples + cd "$INSTALL_TREE"/share/plplot[0-9].[0-9]*.[0-9]*/examples output="$OUTPUT_TREE"/traditional_make_interactive.out rm -f "$output" echo "Traditional $build_command test_interactive in the installed examples tree" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |