sub var_subst {
my ($text, $name, $value) = @_;
if ($value) {
- $text =~ s/\${$name(?::[=-][^}]*)?}/$value/g;
+ $text =~ s/\$\{$name(?::[=-][^}]*)?\}/$value/g;
$text =~ s/\$$name(\W|$)/$value$1/g;
}
else {
- $text =~ s/\${$name:=([^}]*)}/$1/g;
- $text =~ s/\${$name}//g;
+ $text =~ s/\$\{$name:=([^}]*)\}/$1/g;
+ $text =~ s/\$\{$name}//g;
$text =~ s/\$$name(\W|$)/$1/g;
}
return $text;
if ( $line =~ /(\S+)\s*\)$/ ) {
$tesh_file = $1;
$tesh_file =~ s/^[^\/\$]/$path\/$&/;
- $tesh_file =~ s/\${CMAKE_HOME_DIRECTORY}/$proj_dir/g;
+ $tesh_file =~ s/\$\{CMAKE_HOME_DIRECTORY\}/$proj_dir/g;
if ( ! -e "$tesh_file" ) {
print "# tesh_file: $tesh_file does not exist!\n";
print "# $line\n";
foreach my $factory (split(';', $factories)) {
$close=0;
if( $factory =~ /^raw/) {
- print "${indent}if(HAVE_RAWCTX)\n";
+ print "${indent}if(HAVE_RAW_CONTEXTS)\n";
$close=1;
}elsif( $factory =~ /^boost/) {
- print "${indent}if(HAVE_BOOST_CONTEXT)\n";
+ print "${indent}if(HAVE_BOOST_CONTEXTS)\n";
$close=1;
}elsif( $factory =~ /^ucontext/) {
- print "${indent}if(CONTEXT_UCONTEXT)\n";
+ print "${indent}if(HAVE_UCONTEXT_CONTEXTS)\n";
$close=1;
}elsif( $factory =~ /^thread/) {
- print "${indent}if(CONTEXT_THREADS)\n";
+ print "${indent}if(HAVE_THREAD_CONTEXTS)\n";
$close=1;
}
print "${indent}ADD_TEST(NAME memcheck-$name_test-$factory-$count\n";