INCLUDE(CTest)\r
ENABLE_TESTING()\r
\r
-# BEGIN TESH TESTS\r
-\r
-# teshsuite/xbt\r
-IF(${ARCH_32_BITS})\r
- ADD_TEST(tesh-gras-msg_handle-sg-32 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_32)\r
-ELSE(${ARCH_32_BITS})\r
- ADD_TEST(tesh-gras-msg_handle-sg-64 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/msg_handle/test_sg_64)\r
-ENDIF(${ARCH_32_BITS})\r
-\r
-ADD_TEST(tesh-gras-empty_main-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/empty_main/test_rl)\r
-ADD_TEST(tesh-gras-empty_main-sg perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/empty_main/test_sg)\r
-\r
-IF(${ARCH_32_BITS})\r
- ADD_TEST(tesh-gras-small_sleep-sg-32 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_32)\r
-ELSE(${ARCH_32_BITS})\r
- ADD_TEST(tesh-gras-small_sleep-sg-64 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64)\r
-ENDIF(${ARCH_32_BITS})\r
-\r
-ADD_TEST(tesh-msg-get_sender perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh) \r
-ADD_TEST(tesh-simdag-reinit_costs perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)\r
-ADD_TEST(tesh-simdag-parser perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)\r
-ADD_TEST(tesh-simdag-flatifier perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)\r
+ADD_TEST(tesh-msg-get_sender perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh) \r
+ADD_TEST(tesh-simdag-reinit_costs perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)\r
+ADD_TEST(tesh-simdag-parser perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)\r
+ADD_TEST(tesh-simdag-parser-bogus-symmetric perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)\r
+ADD_TEST(tesh-simdag-parser-sym-full perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)\r
+ADD_TEST(tesh-simdag-flatifier perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)\r
+ADD_TEST(tesh-simdag-full_links perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)\r
ADD_TEST(tesh-simdag-basic0 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh)\r
ADD_TEST(tesh-simdag-basic1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh)\r
ADD_TEST(tesh-simdag-basic2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh)\r
ADD_TEST(tesh-simdag-p2p-1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)\r
ADD_TEST(tesh-simdag-p2p-2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)\r
ADD_TEST(tesh-simdag-p2p-3 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)\r
-ADD_TEST(tesh-simdag-p2p-3 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)\r
+ADD_TEST(tesh-simdag-p2p-4 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)\r
ADD_TEST(tesh-simdag-mxn-1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)\r
ADD_TEST(tesh-simdag-mxn-2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)\r
ADD_TEST(tesh-simdag-mxn-3 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)\r
ADD_TEST(tesh-simdag-par-1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh)\r
ADD_TEST(tesh-simdag-par-2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh)\r
\r
-# GRAS examples\r
-ADD_TEST(gras-ping-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/ping test_rl)\r
-ADD_TEST(gras-rpc-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/rpc test_rl)\r
-ADD_TEST(gras-spawn-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/spawn test_rl)\r
-\r
-ADD_TEST(gras-timer-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/timer test_rl)\r
-set_tests_properties(gras-timer-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-chrono-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/chrono test_rl)\r
-set_tests_properties(gras-chrono-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-simple_token-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token test_rl)\r
-\r
-ADD_TEST(gras-mmrpc-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/mmrpc test_rl)\r
-set_tests_properties(gras-mmrpc-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-all2all-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/all2all test_rl)\r
-set_tests_properties(gras-all2all-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-pmm-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/pmm test_rl)\r
-set_tests_properties(gras-pmm-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-synchro-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/synchro test_rl)\r
-set_tests_properties(gras-synchro-rl PROPERTIES TIMEOUT 10)\r
-\r
-ADD_TEST(gras-properties-rl perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/gras/properties test_rl)\r
-set_tests_properties(gras-properties-rl PROPERTIES TIMEOUT 10)\r
-\r
# MSG examples\r
ADD_TEST(msg-suspend perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg suspend/suspend.tesh)\r
ADD_TEST(msg-masterslave perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave.tesh)\r
ADD_TEST(msg-trace perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg trace/trace.tesh)\r
ADD_TEST(msg-masterslave_cpu_ti perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti.tesh)\r
ADD_TEST(msg_icomms perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/icomms peer.tesh)\r
-ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 \r
- ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml\r
- ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)\r
+ADD_TEST(msg_icomms_waitany ${PROJECT_DIRECTORY}/examples/msg/icomms/peer3 ${PROJECT_DIRECTORY}/examples/msg/icomms/small_platform.xml ${PROJECT_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)\r
\r
IF(HAVE_TRACING)\r
ADD_TEST(tracing-ms perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg tracing/ms.tesh)\r
ADD_TEST(smpi-tracing-ptp perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/examples/smpi ${PROJECT_DIRECTORY}/examples/smpi/smpi_traced.tesh)\r
endif(HAVE_TRACING)\r
endif(enable_smpi)\r
-\r
-if(HAVE_GTNETS)\r
-ADD_TEST(msg-gtnets-waxman perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh)\r
-ADD_TEST(msg-gtnets-dogbone perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh)\r
-ADD_TEST(msg-gtnets-onelink perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-gtnets.tesh)\r
-ADD_TEST(msg-gtnets-dogbone-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-lv08.tesh)\r
-ADD_TEST(msg-gtnets-onelink-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh)\r
- if(HAVE_TRACING)\r
- ADD_TEST(msg-tracing-gtnets-waxman perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-waxman.tesh)\r
- ADD_TEST(msg-tracing-gtnets-dogbone perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-gtnets.tesh)\r
- ADD_TEST(msg-tracing-gtnets-onelink perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-gtnets.tesh)\r
- ADD_TEST(msg-tracing-gtnets-dogbone-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-dogbone-lv08.tesh)\r
- ADD_TEST(msg-tracing-gtnets-onelink-lv08 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg gtnets/tracing-gtnets-onelink-lv08.tesh)\r
- endif(HAVE_TRACING)\r
-endif(HAVE_GTNETS)\r
-\r
-# Lua examples\r
-if(HAVE_LUA)\r
-ADD_TEST(lua-masterslave perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh)\r
-ADD_TEST(lua-mult_matrix perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh)\r
-ADD_TEST(lua-masterslave_bypass perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh)\r
-ADD_TEST(msg-masterslave-console perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh)\r
-endif(HAVE_LUA)\r
-\r
-# Ruby examples\r
-if(HAVE_RUBY)\r
-ADD_TEST(ruby-masterslave perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby MasterSlave.tesh)\r
-ADD_TEST(ruby-ping_pong perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby PingPong.tesh)\r
-ADD_TEST(ruby-quicksort perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/ruby Quicksort.tesh)\r
-endif(HAVE_RUBY)\r
-\r
-# END TESH TESTS\r
-\r
+ \r
+# examples/msg/mc\r
if(HAVE_MC)\r
ADD_TEST(mc-bugged1 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc bugged1.tesh)\r
ADD_TEST(mc-bugged2 perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc bugged2.tesh)\r
ADD_TEST(mc-centralized perl ${PROJECT_DIRECTORY}/buildtools/Cmake/tesh.pl ${PROJECT_DIRECTORY}/examples/msg/mc centralized.tesh)\r
endif(HAVE_MC)\r
\r
-if(HAVE_JAVA)\r
-# java examples\r
-ADD_TEST(java-basic ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest ${simgrid_BINARY_DIR})\r
-ADD_TEST(java-pingpong ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest ${simgrid_BINARY_DIR})\r
-ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest ${simgrid_BINARY_DIR})\r
-ADD_TEST(java-suspend ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest ${simgrid_BINARY_DIR})\r
-endif(HAVE_JAVA)\r
-\r
-if(HAVE_RUBY)\r
-set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true)\r
-endif(HAVE_RUBY)\r
-\r
-ADD_TEST(tesh-log-large ${PROJECT_DIRECTORY}/teshsuite/xbt/log_large_test --log=root.fmt:%m%n)\r
-\r
-ADD_TEST(msg-sendrecv_CLM03 ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02)\r
-ADD_TEST(msg-sendrecv_Vegas ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas")\r
-ADD_TEST(msg-sendrecv_Reno ${PROJECT_DIRECTORY}/examples/msg/sendrecv/sendrecv.exe ${PROJECT_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${PROJECT_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical)\r
-\r
+ADD_TEST(tesh-simdag-full-links01 ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)\r
+ADD_TEST(tesh-simdag-full-links02 ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)\r
+ADD_TEST(tesh-simdag-one-link-g5k ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)\r
+ADD_TEST(msg_icomms_waitany ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)\r
\r
# testsuite directory\r
add_test(test-xbt-log ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage)\r
add_test(test-xbt-graphxml ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml)\r
add_test(test-xbt-heap ${PROJECT_DIRECTORY}/testsuite/xbt/heap_bench)\r
\r
+add_test(test-surf-lmm ${CMAKE_HOME_DIRECTORY}/testsuite/surf/lmm_usage)\r
+add_test(test-surf-maxmin ${CMAKE_HOME_DIRECTORY}/testsuite/surf/maxmin_bench)\r
+add_test(test-surf-usage ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)\r
+add_test(test-surf_usage2 ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2 --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)\r
+add_test(test-surf-trace ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)\r
+\r
add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)\r
add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)\r
add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)\r
\r
-add_test(testall ${PROJECT_DIRECTORY}/src/testall)
\ No newline at end of file
+add_test(testall ${PROJECT_DIRECTORY}/src/testall)\r
+\r
+\r