Changeset 002daed


Ignore:
Timestamp:
Aug 16, 2017 9:33:02 AM (5 weeks ago)
Author:
www-data <www-data@…>
Branches:
master
Children:
e87a9d5
Parents:
303022f
git-author:
Bang Pham Huu <b.phamhuu@…> (08/15/17 16:42:08)
git-committer:
www-data <www-data@…> (08/16/17 09:33:02)
Message:

ticket:1605 - System test should not execute test scripts in testcases_service folder when Java is disabled from build configuration

Summary:
Current, these test scripts (test.sh) in testcases_services folder will

always run. It should skip them when -DENABLE_JAVA=OFF (or --disable-java
in autotools) as petascope, secore don't exist to run test wcst_import,
wcs, wcps,...

Test Plan: Build rasdaman and run system test.

Reviewers: dmisev

Differential Revision: http://codereview.rasdaman.org/D450

Location:
systemtest
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • systemtest/CMakeLists.txt

    r57107c1 r002daed  
    2020# or contact Peter Baumann via <baumann@rasdaman.com>.
    2121
     22set(TEST_SEQUENCE "testcases_mandatory/* testcases_open/* testcases_fixed/*")
     23if (ENABLE_JAVA)
     24        set(TEST_SEQUENCE "testcases_mandatory/* testcases_open/* testcases_fixed/* testcases_services/*")
     25endif()
     26
     27configure_file("${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh" @ONLY)
     28
    2229add_custom_target(check
    2330        COMMAND ./run_test.sh ${BIN_DIR}
  • systemtest/Makefile.am

    r1b40e87 r002daed  
    3434
    3535########################### Targets ##############################
    36 TESTSEQUENCE = $(shell) ls -d testcases_mandatory/* \
    37                              testcases_open/* \
    38                              testcases_fixed/* \
    39                              testcases_services/*
     36
     37TESTSEQUENCE = testcases_mandatory/* testcases_open/* testcases_fixed/*
     38
     39if ENABLE_JAVA
     40        TESTSEQUENCE = testcases_mandatory/* testcases_open/* testcases_fixed/* testcases_services/*
     41endif
     42
     43
     44.PHONY: all
     45all:
     46        cp "run_test.sh.in" "run_test.sh"; \
     47        sed -i "s|@TEST_SEQUENCE@|${TESTSEQUENCE}|g" "run_test.sh"
     48       
     49
    4050# general system test
    4151.PHONY: check
    4252check:
    43         ret=0; \
    44         for testcase in ${TESTSEQUENCE}; do\
    45                 PATH=${bindir}:${PATH}\
    46                 PROGTEST=$${testcase}/*.sh;\
    47                 if [ ! -f $$testcase/*.sh ]; then\
    48                         continue;\
    49                 fi;\
    50                 echo; \
    51                 echo; \
    52                 $$testcase/*.sh;\
    53                 tmp=$$?;\
    54                 if [ $$tmp -eq 2 ]; then\
    55                         echo $${PROGTEST} ... SKIPPED>>logtmp;\
    56                 elif [ $$tmp -ne 0 ]; then\
    57                         ret=$$tmp;\
    58                         echo $${PROGTEST} ... FAIL>>logtmp;\
    59                 else \
    60                         echo $${PROGTEST} ... OK>>logtmp;\
    61                 fi; \
    62                 echo "  "see detail in $$testcase/log>>logtmp;\
    63         done;\
    64         echo -e "\n\nTEST SUMMARY\n";\
    65         cat logtmp;\
    66         rm logtmp;\
    67         exit $$ret;
     53        bash run_test.sh ${bindir}
     54        exit $$?;
    6855
    6956.PHONY: clean
Note: See TracChangeset for help on using the changeset viewer.