Project

General

Profile

« Previous | Next » 

Revision c34a50ff

Added by Pierre-Loïc Garoche about 6 years ago

Better naming

View differences:

regression_tests/lustre_files/success/Simulink/CMakeLists.txt
65 65
	DST_DIR ${DST_DIR}
66 66
	)
67 67

  
68
            LustreT_MCDC(
68
      LustreT_MCDC(
69 69
	LUS_FILE ${lus_file}
70 70
	NODE ${NODE_NAME}
71
	TESTS_PREFIX "${TESTS_PREFIX}"
71 72
	OPTS ${LUSTRE_OPTIONS_OPT} 
72 73
	CALL_ID "4"
73 74
	SRC_DIR ${SRC_DIR}
......
77 78
      LustreT_Mutants(
78 79
	LUS_FILE ${lus_file}
79 80
	NODE ${NODE_NAME}
81
	TESTS_PREFIX "${TESTS_PREFIX}"
80 82
	OPTS ${LUSTRE_OPTIONS_OPT} 
81 83
	CALL_ID "5"
82 84
	SRC_DIR ${SRC_DIR}
regression_tests/lustre_files/success/Stateflow/CMakeLists.txt
49 49
      LustreT_MCDC(
50 50
	LUS_FILE ${lus_file}
51 51
	NODE ${NODE_NAME}
52
	TESTS_PREFIX "${TESTS_PREFIX}"
52 53
	OPTS ${LUSTRE_OPTIONS_OPT} 
53 54
	CALL_ID "3"
54 55
	SRC_DIR ${SRC_DIR}
......
58 59
      LustreT_Mutants(
59 60
	LUS_FILE ${lus_file}
60 61
	NODE ${NODE_NAME}
62
	TESTS_PREFIX "${TESTS_PREFIX}"
61 63
	OPTS ${LUSTRE_OPTIONS_OPT} 
62 64
	CALL_ID "4"
63 65
	SRC_DIR ${SRC_DIR}
regression_tests/lustre_files/success/clocks/CMakeLists.txt
36 36
      LustreT_MCDC(
37 37
	LUS_FILE ${lus_file}
38 38
	NODE ${NODE_NAME}
39
	TESTS_PREFIX "${TESTS_PREFIX}"
39 40
	OPTS ${LUSTRE_OPTIONS_OPT} 
40 41
	CALL_ID "5"
41 42
	SRC_DIR ${SRC_DIR}
......
45 46
      LustreT_Mutants(
46 47
	LUS_FILE ${lus_file}
47 48
	NODE ${NODE_NAME}
49
	TESTS_PREFIX "${TESTS_PREFIX}"
48 50
	OPTS ${LUSTRE_OPTIONS_OPT} 
49 51
	CALL_ID "5"
50 52
	SRC_DIR ${SRC_DIR}
regression_tests/lustre_files/success/kind_fmcad08/CMakeLists.txt
81 81
      LustreT_MCDC(
82 82
	LUS_FILE ${lus_file}
83 83
	NODE ${NODE_NAME}
84
	TESTS_PREFIX "${TESTS_PREFIX}"
84 85
	OPTS ${LUSTRE_OPTIONS_OPT} 
85 86
	CALL_ID "5"
86 87
	SRC_DIR ${SRC_DIR}
......
90 91
      LustreT_Mutants(
91 92
	LUS_FILE ${lus_file}
92 93
	NODE ${NODE_NAME}
94
	TESTS_PREFIX "${TESTS_PREFIX}"
93 95
	OPTS ${LUSTRE_OPTIONS_OPT} 
94 96
	CALL_ID "5"
95 97
	SRC_DIR ${SRC_DIR}
regression_tests/lustre_files/success/machine_types/CMakeLists.txt
81 81
      LustreT_MCDC(
82 82
	LUS_FILE ${lus_file}
83 83
	NODE ${NODE_NAME}
84
	TESTS_PREFIX "${TESTS_PREFIX}"
84 85
	OPTS ${LUSTRE_OPTIONS_OPT} 
85 86
	CALL_ID "5"
86 87
	SRC_DIR ${SRC_DIR}
......
90 91
      LustreT_Mutants(
91 92
	LUS_FILE ${lus_file}
92 93
	NODE ${NODE_NAME}
94
	TESTS_PREFIX "${TESTS_PREFIX}"
93 95
	OPTS ${LUSTRE_OPTIONS_OPT} 
94 96
	CALL_ID "5"
95 97
	SRC_DIR ${SRC_DIR}
regression_tests/modules/strategies.cmake
478 478

  
479 479
function(LustreT_MCDC)
480 480
  set(options "")
481
  set(oneValueArgs  NODE LUS_FILE CALL_ID  SRC_DIR DST_DIR)
481
  set(oneValueArgs  NODE LUS_FILE CALL_ID TESTS_PREFIX SRC_DIR DST_DIR)
482 482
  set(multiValueArgs  OPTS )
483 483
  cmake_parse_arguments(GEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
484 484

  
......
496 496

  
497 497
  file(MAKE_DIRECTORY "${GEN_DST_DIR}/${L}/node_${GEN_NODE}_MCDC")
498 498

  
499
  add_test(NAME LUSTRET_MCDC_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
499
  add_test(NAME ${GEN_TESTS_PREFIX}_LUSTRET_MCDC_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
500 500
    COMMAND  ${LUSTRE_T} -mcdc-cond ${LUSTREC_ARGS_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
501 501
    WORKING_DIRECTORY ${LUSTRE_OUTPUT_DIR_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
502 502
    )
......
510 510
     )
511 511

  
512 512
  
513
  add_test(NAME LUSTRET_MCDC_COMPILE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
513
  add_test(NAME ${GEN_TESTS_PREFIX}_LUSTRET_MCDC_COMPILE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
514 514
    COMMAND  ${LUSTRE_COMPILER} ${LUSTREC_ARGS_${L}.mcdc_${GEN_NODE}_${LUS_OPTS_CUT}}
515 515
    WORKING_DIRECTORY ${LUSTRE_OUTPUT_DIR_${L}_mcdc_${GEN_NODE}_${LUS_OPTS_CUT}}
516 516
    )
517 517

  
518
  SET_TESTS_PROPERTIES ( LUSTRET_MCDC_COMPILE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
518
  SET_TESTS_PROPERTIES ( ${GEN_TESTS_PREFIX}_LUSTRET_MCDC_COMPILE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
519 519
    PROPERTIES 
520
    DEPENDS LUSTRET_MCDC_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID})
520
    DEPENDS ${GEN_TESTS_PREFIX}_LUSTRET_MCDC_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID})
521 521
  
522 522
endfunction()
523 523

  
......
526 526

  
527 527
function(LustreT_mutants)
528 528
  set(options "")
529
  set(oneValueArgs  NODE LUS_FILE CALL_ID  SRC_DIR DST_DIR)
529
  set(oneValueArgs  NODE LUS_FILE CALL_ID TESTS_PREFIX  SRC_DIR DST_DIR)
530 530
  set(multiValueArgs  OPTS )
531 531
  cmake_parse_arguments(GEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
532 532

  
......
544 544

  
545 545
  file(MAKE_DIRECTORY "${GEN_DST_DIR}/${L}/node_${GEN_NODE}_Mutants")
546 546

  
547
  add_test(NAME LUSTRET_MUTATION_GEN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
547
  add_test(NAME ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_GEN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
548 548
    COMMAND  ${LUSTRE_T} ${LUSTREC_ARGS_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
549 549
    WORKING_DIRECTORY ${LUSTRE_OUTPUT_DIR_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
550 550
    )
551 551

  
552
  add_test(NAME LUSTRET_MUTATION_BUILDMAKE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
552
  add_test(NAME ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_BUILDMAKE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
553 553
    COMMAND  "cmake" "."
554 554
    WORKING_DIRECTORY ${GEN_DST_DIR}/${L}/node_${GEN_NODE}_Mutants
555 555
    )
556 556

  
557
  add_test(NAME LUSTRET_MUTATION_BUILDBIN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
557
  add_test(NAME ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_BUILDBIN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
558 558
    COMMAND  "make"
559 559
    WORKING_DIRECTORY ${GEN_DST_DIR}/${L}/node_${GEN_NODE}_Mutants
560 560
    )
561 561

  
562
  SET_TESTS_PROPERTIES ( LUSTRET_MUTATION_BUILDMAKE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
562
  SET_TESTS_PROPERTIES ( ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_BUILDMAKE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
563 563
    PROPERTIES 
564
    DEPENDS LUSTRET_MUTATION_GEN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID} )
564
    DEPENDS ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_GEN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID} )
565 565

  
566
  SET_TESTS_PROPERTIES ( LUSTRET_MUTATION_BUILDBIN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
566
  SET_TESTS_PROPERTIES ( ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_BUILDBIN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
567 567
    PROPERTIES 
568
    DEPENDS LUSTRET_MUTATION_BUILDMAKE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID} )
568
    DEPENDS ${GEN_TESTS_PREFIX}_LUSTRET_MUTATION_BUILDMAKE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID} )
569 569

  
570 570
endfunction()
571 571

  

Also available in: Unified diff