From b141e7dadf8af49b3e6938268cec0443ea61a0b4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 5 May 2014 11:40:20 +0200 Subject: [PATCH] Remove useless script (replaced by cmake macro ADD_TESH_FACTORIES). --- buildtools/Cmake/AddTests.cmake | 1 - buildtools/Cmake/DefinePackages.cmake | 1 - .../Cmake/Scripts/generate_new_tests.pl | 102 ------------------ 3 files changed, 104 deletions(-) delete mode 100755 buildtools/Cmake/Scripts/generate_new_tests.pl diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index c85afe565a..db1f9b1a73 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -108,7 +108,6 @@ if(NOT enable_memcheck) ADD_TESH(test-surf-usage --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/surf_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ surf_usage/surf_usage.tesh) ADD_TESH(test-surf-trace --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/trace_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ trace_usage/trace_usage.tesh) - # BEGIN CONTEXTS FACTORY if(HAVE_RAWCTX) ADD_TESH(simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_raw.tesh) elseif(CONTEXT_UCONTEXT) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 8a3650d0aa..c8d6fe5d1b 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1119,7 +1119,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/Makefile.default buildtools/Cmake/Scripts/SimGrid.packproj buildtools/Cmake/Scripts/generate_memcheck_tests.pl - buildtools/Cmake/Scripts/generate_new_tests.pl buildtools/Cmake/Scripts/java_bundle.sh buildtools/Cmake/Scripts/my_valgrind.pl buildtools/Cmake/Scripts/postinstall.sh diff --git a/buildtools/Cmake/Scripts/generate_new_tests.pl b/buildtools/Cmake/Scripts/generate_new_tests.pl deleted file mode 100755 index e3c807cd9b..0000000000 --- a/buildtools/Cmake/Scripts/generate_new_tests.pl +++ /dev/null @@ -1,102 +0,0 @@ -#!/usr/bin/perl -w - -# Copyright (c) 2012, 2014. The SimGrid Team. -# All rights reserved. - -# This program is free software; you can redistribute it and/or modify it -# under the terms of the license (GNU LGPL) which comes with this package. - -use strict; - -# input file = AddTest.txt - -if($#ARGV!=0) { - die "Usage: generate_new_tests.pl AddTests.cmake\n"; -} - -open MAKETEST, $ARGV[0] or die "Unable to open $ARGV[1]. $!\n"; - -my($line); -my($path); -my($dump)=0; -my($setenv); -my($tesh_file); -my($config_var); -my($name_test); - -while(defined($line=)) -{ - chomp $line; - if($line =~ /BEGIN CONTEXTS FACTORY/) { - print "$line\n"; - $dump = 1; - next; - } - if($line =~ /HAVE_TRACING/) { - print "$line\n"; - $dump = !$dump; - next; - } - if($line =~ /HAVE_LUA/) { - print "$line\n"; - $dump = !$dump; - next; - } - if($line =~ /HAVE_RUBY/) { - print "$line\n"; - $dump = !$dump; - next; - } - if($dump) - { - if($line =~ /ADD_TEST.*\/bin\/tesh/) - { - $setenv = ""; - $config_var = ""; - $path = ""; - $tesh_file = ""; - $name_test = ""; - - if($line =~ /ADD_TEST\(([\S]+)/) - { - $name_test =($1); - } - if($line =~ /--cfg\s*\t*(\S*)/) - { - $config_var = "--cfg $1 $config_var"; - } - if($line =~ /--cd\s*(\S+)/) - { - $path="--cd $1"; - } - if($line =~ /--setenv\s*\t*(\S*)\=(\S*)/) - { - $setenv = "--setenv $1=$2 $setenv"; - } - if($line =~ /([\S]+)[)]$/) - { - $tesh_file =($1); - } - - print "ADD_TEST($name_test-raw \$\{CMAKE_BINARY_DIR\}/bin/tesh --cfg contexts/factory:raw $config_var $setenv $path $tesh_file)\n"; - print "ADD_TEST($name_test-thread \$\{CMAKE_BINARY_DIR\}/bin/tesh --cfg contexts/factory:thread $config_var $setenv $path $tesh_file)\n"; - print "ADD_TEST($name_test-ucontext \$\{CMAKE_BINARY_DIR\}/bin/tesh --cfg contexts/factory:ucontext $config_var $setenv $path $tesh_file)\n"; - } - elsif($line =~ /set_tests_properties\(([\S]+)/) - { - my($name_temp)=($1); - $line =~ s/$name_temp/$name_temp-raw $name_temp-thread $name_temp-ucontext/g; - print $line."\n"; - } - else - { - print "$line\n"; - } - - } - else - { - print "$line\n"; - } -} -close(MAKETEST); -- 2.20.1