Rename 'exp-ptrcheck' to 'exp-sgcheck' and hope this does not cause

too much build carnage.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11745

diff --git a/Makefile.am b/Makefile.am
index be6e8b765df749b40337ebb07c76a91cc31ecbef..67b6e201f067a3b6c5f2088a27fd3f8b8dd2a934 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ TOOLS =               memcheck \
                helgrind \
                drd
 
-EXP_TOOLS =    exp-ptrcheck \
+EXP_TOOLS =    exp-sgcheck \
                exp-bbv \
                exp-dhat
 
@@ -50,7 +50,7 @@ SUPP_FILES = \
        glibc-2.34567-NPTL-helgrind.supp \
        glibc-2.2-LinuxThreads-helgrind.supp \
        glibc-2.X-drd.supp \
-       exp-ptrcheck.supp \
+       exp-sgcheck.supp \
        darwin9.supp darwin9-drd.supp \
        darwin10.supp darwin10-drd.supp
 DEFAULT_SUPP_FILES = @DEFAULT_SUPP@

diff --git a/configure.in b/configure.in
index a0df0633513a118181fd021b5466554fec054032..f3fe57523105dccbfeedb25c9dde4ae8ac781405 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -808,8 +808,8 @@ AC_SUBST(GLIBC_VERSION)
 DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
 DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
 
-# Add glibc and X11 suppressions for exp-ptrcheck
-DEFAULT_SUPP="exp-ptrcheck.supp ${DEFAULT_SUPP}"
+# Add glibc and X11 suppressions for exp-sgcheck
+DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}"
 
 
 #----------------------------------------------------------------------------
@@ -1951,8 +1951,8 @@ AC_CONFIG_FILES([
    none/tests/linux/Makefile
    none/tests/darwin/Makefile
    none/tests/x86-linux/Makefile
-   exp-ptrcheck/Makefile
-   exp-ptrcheck/tests/Makefile
+   exp-sgcheck/Makefile
+   exp-sgcheck/tests/Makefile
    drd/Makefile
    drd/scripts/download-and-build-splash2
    drd/tests/Makefile

diff --git a/docs/xml/manual.xml b/docs/xml/manual.xml
index b1ec6d5c3fda92c3864acbbfa502f6ca9926fde9..333e5b77866c70d354f8b84853059dc359917426 100644 (file)
--- a/docs/xml/manual.xml
+++ b/docs/xml/manual.xml
@@ -38,7 +38,7 @@
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../exp-dhat/docs/dh-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="../../exp-ptrcheck/docs/pc-manual.xml" parse="xml"  
+  <xi:include href="../../exp-sgcheck/docs/sg-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../exp-bbv/docs/bbv-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />      

diff --git a/exp-ptrcheck.supp b/exp-ptrcheck.supp
deleted file mode 100644 (file)
index fd077d6..0000000
--- a/exp-ptrcheck.supp
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-   lib-X11-used-old-pointer-after-realloc-1
-   exp-ptrcheck:Heap
-   fun:strlen
-   obj:/usr/lib*/libX11.so*
-   obj:/usr/lib*/libX11.so*
-}
-{
-   lib-X11-used-old-pointer-after-realloc-2
-   exp-ptrcheck:Heap
-   obj:/usr/lib*/libX11.so*
-   obj:/usr/lib*/libX11.so*
-}
-
-{
-   ld-2.X-invalid-Add32/64-who-knows
-   exp-ptrcheck:Arith
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
-}
-
-{
-   ld-2.X possibly applying relocations
-   exp-ptrcheck:SorG
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
-}
-
-# I'm pretty sure this is a false positive caused by the sg_ stuff
-{
-   glibc realpath false positive
-   exp-ptrcheck:SorG
-   fun:realpath
-   fun:*
-}
-
-{
-   If I had to guess, inlined or nameless strlen etc in ld.so
-   exp-ptrcheck:Heap
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
-}
-
-{
-   I think this is glibc's ultra optimised getenv doing 2 byte reads
-   exp-ptrcheck:SorG
-   fun:getenv
-}
-
-{
-   Occurs on Fedora 7--9?
-   exp-ptrcheck:Heap
-   fun:_dl_fini
-   fun:exit
-   fun:(below main)
-}
-
-
-# Invalid read of size 16
-#    at 0x5643A5C: ??? (strcpy.S:94)
-#    by 0x50C6A99: XtResolvePathname (in /usr/lib/libXt.so.6.0.0)
-#    by 0x50C3856: XtScreenDatabase (in /usr/lib/libXt.so.6.0.0)
-#    by 0x50C4386: _XtDisplayInitialize (in /usr/lib/libXt.so.6.0.0)
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libX*so*
-}
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 2
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libICE*so*
-}
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 3
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libglib*so*
-}
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 4
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libfontconfig*so*
-}

diff --git a/exp-sgcheck.supp b/exp-sgcheck.supp
new file mode 100644 (file)
index 0000000..a0553f0
--- /dev/null
+++ b/exp-sgcheck.supp
@@ -0,0 +1,20 @@
+{
+   ld-2.X possibly applying relocations
+   exp-sgcheck:SorG
+   obj:/*lib*/ld-2.*so*
+   obj:/*lib*/ld-2.*so*
+}
+
+# I'm pretty sure this is a false positive caused by the sg_ stuff
+{
+   glibc realpath false positive
+   exp-sgcheck:SorG
+   fun:realpath
+   fun:*
+}
+
+{
+   I think this is glibc's ultra optimised getenv doing 2 byte reads
+   exp-sgcheck:SorG
+   fun:getenv
+}

diff --git a/exp-ptrcheck/Makefile.am b/exp-sgcheck/Makefile.am
similarity index 50%
rename from exp-ptrcheck/Makefile.am
rename to exp-sgcheck/Makefile.am
index 3ccc47817d5d873fa050275ca1a6a8386bbe3edf..a1c5d897b05e5d38b5debb2661fa72ba0d05eabf 100644 (file)
--- a/exp-ptrcheck/Makefile.am
+++ b/exp-sgcheck/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.tool.am
 
-EXTRA_DIST = docs/pc-manual.xml
+EXTRA_DIST = docs/sg-manual.xml
 
 #----------------------------------------------------------------------------
 # Headers, etc
@@ -12,12 +12,12 @@ noinst_HEADERS = \
        sg_main.h
 
 #----------------------------------------------------------------------------
-# exp-ptrcheck-<platform>
+# exp-sgcheck-<platform>
 #----------------------------------------------------------------------------
 
-noinst_PROGRAMS  = exp-ptrcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@
+noinst_PROGRAMS  = exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@
 if VGCONF_HAVE_PLATFORM_SEC
-noinst_PROGRAMS += exp-ptrcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@
+noinst_PROGRAMS += exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@
 endif
 
 EXP_PTRCHECK_SOURCES_COMMON = \
@@ -26,53 +26,53 @@ EXP_PTRCHECK_SOURCES_COMMON = \
        pc_main.c \
        sg_main.c
 
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES      = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES      = \
        $(EXP_PTRCHECK_SOURCES_COMMON)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS     = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS     = \
        $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS       = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS       = \
        $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
        $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD        = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD        = \
        $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS      = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS      = \
        $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \
        $(top_builddir)/coregrind/link_tool_exe_@VGCONF_OS@ \
        @VALT_LOAD_ADDRESS_PRI@ \
        $(LINK) \
-       $(exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \
-       $(exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS)
+       $(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \
+       $(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS)
 
 if VGCONF_HAVE_PLATFORM_SEC
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES      = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES      = \
        $(EXP_PTRCHECK_SOURCES_COMMON)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS     = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS     = \
        $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS       = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS       = \
        $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
        $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD        = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD        = \
        $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS      = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS      = \
        $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \
        $(top_builddir)/coregrind/link_tool_exe_@VGCONF_OS@ \
        @VALT_LOAD_ADDRESS_SEC@ \
        $(LINK) \
-       $(exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \
-       $(exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS)
+       $(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \
+       $(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS)
 endif
 
 #----------------------------------------------------------------------------
-# vgpreload_exp-ptrcheck-<platform>.so
+# vgpreload_exp-sgcheck-<platform>.so
 #----------------------------------------------------------------------------
 
-noinst_PROGRAMS += vgpreload_exp-ptrcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
+noinst_PROGRAMS += vgpreload_exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
 if VGCONF_HAVE_PLATFORM_SEC
-noinst_PROGRAMS += vgpreload_exp-ptrcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
+noinst_PROGRAMS += vgpreload_exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
 endif
 
 if VGCONF_OS_IS_DARWIN
@@ -81,28 +81,28 @@ endif
 
 VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON = h_intercepts.c
 
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES      = \
        $(VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS     = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS     = \
        $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS       = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS       = \
        $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \
        $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS      = \
        $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \
        $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
 
 if VGCONF_HAVE_PLATFORM_SEC
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES      = \
        $(VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS     = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS     = \
        $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS       = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS       = \
        $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \
        $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS      = \
        $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) \
        $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
 endif

diff --git a/exp-ptrcheck/docs/pc-manual.xml b/exp-sgcheck/docs/sg-manual.xml
similarity index 100%
rename from exp-ptrcheck/docs/pc-manual.xml
rename to exp-sgcheck/docs/sg-manual.xml

diff --git a/exp-ptrcheck/h_intercepts.c b/exp-sgcheck/h_intercepts.c
similarity index 100%
rename from exp-ptrcheck/h_intercepts.c
rename to exp-sgcheck/h_intercepts.c

diff --git a/exp-ptrcheck/h_main.c b/exp-sgcheck/h_main.c
similarity index 100%
rename from exp-ptrcheck/h_main.c
rename to exp-sgcheck/h_main.c

diff --git a/exp-ptrcheck/h_main.h b/exp-sgcheck/h_main.h
similarity index 100%
rename from exp-ptrcheck/h_main.h
rename to exp-sgcheck/h_main.h

diff --git a/exp-ptrcheck/pc_common.c b/exp-sgcheck/pc_common.c
similarity index 100%
rename from exp-ptrcheck/pc_common.c
rename to exp-sgcheck/pc_common.c

diff --git a/exp-ptrcheck/pc_common.h b/exp-sgcheck/pc_common.h
similarity index 100%
rename from exp-ptrcheck/pc_common.h
rename to exp-sgcheck/pc_common.h

diff --git a/exp-ptrcheck/pc_main.c b/exp-sgcheck/pc_main.c
similarity index 96%
rename from exp-ptrcheck/pc_main.c
rename to exp-sgcheck/pc_main.c
index 6997bb44ab8f13d4ace7af8dac846df4bd6faa41..21edef182b764c9052a6f57ebb2117f24ea3a318 100644 (file)
--- a/exp-ptrcheck/pc_main.c
+++ b/exp-sgcheck/pc_main.c
@@ -57,18 +57,18 @@ static void pc_pre_clo_init(void)
 {
 #if defined(VGO_darwin)
    // This makes the (all-failing) regtests run much faster.
-   VG_(printf)("Ptrcheck doesn't work on Darwin yet, sorry.\n");
+   VG_(printf)("SGCheck doesn't work on Darwin yet, sorry.\n");
    VG_(exit)(1);
 #endif
 #if defined(VGA_s390x)
    /* fixs390: to be done. */
-   VG_(printf)("Ptrcheck doesn't work s390x yet, sorry.\n");
+   VG_(printf)("SGCheck doesn't work s390x yet, sorry.\n");
    VG_(exit)(1);
 #endif
 
    // Can't change the name until we change the names in suppressions
    // too.
-   VG_(details_name)            ("exp-ptrcheck");
+   VG_(details_name)            ("exp-sgcheck");
    VG_(details_version)         (NULL);
    VG_(details_description)     ("a stack and global array "
                                  "overrun detector");

diff --git a/exp-ptrcheck/sg_main.c b/exp-sgcheck/sg_main.c
similarity index 100%
rename from exp-ptrcheck/sg_main.c
rename to exp-sgcheck/sg_main.c

diff --git a/exp-ptrcheck/sg_main.h b/exp-sgcheck/sg_main.h
similarity index 100%
rename from exp-ptrcheck/sg_main.h
rename to exp-sgcheck/sg_main.h

diff --git a/exp-ptrcheck/tests/Makefile.am b/exp-sgcheck/tests/Makefile.am
similarity index 100%
rename from exp-ptrcheck/tests/Makefile.am
rename to exp-sgcheck/tests/Makefile.am

diff --git a/exp-ptrcheck/tests/add.c b/exp-sgcheck/tests/add.c
similarity index 100%
rename from exp-ptrcheck/tests/add.c
rename to exp-sgcheck/tests/add.c

diff --git a/exp-ptrcheck/tests/add.stderr.exp b/exp-sgcheck/tests/add.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/add.stderr.exp
rename to exp-sgcheck/tests/add.stderr.exp

diff --git a/exp-ptrcheck/tests/add.vgtest-disabled b/exp-sgcheck/tests/add.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/add.vgtest-disabled
rename to exp-sgcheck/tests/add.vgtest-disabled

diff --git a/exp-ptrcheck/tests/and.c b/exp-sgcheck/tests/and.c
similarity index 100%
rename from exp-ptrcheck/tests/and.c
rename to exp-sgcheck/tests/and.c

diff --git a/exp-ptrcheck/tests/and.stderr.exp b/exp-sgcheck/tests/and.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/and.stderr.exp
rename to exp-sgcheck/tests/and.stderr.exp

diff --git a/exp-ptrcheck/tests/and.vgtest-disabled b/exp-sgcheck/tests/and.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/and.vgtest-disabled
rename to exp-sgcheck/tests/and.vgtest-disabled

diff --git a/exp-ptrcheck/tests/arith.c b/exp-sgcheck/tests/arith.c
similarity index 100%
rename from exp-ptrcheck/tests/arith.c
rename to exp-sgcheck/tests/arith.c

diff --git a/exp-ptrcheck/tests/arith.stderr.exp b/exp-sgcheck/tests/arith.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/arith.stderr.exp
rename to exp-sgcheck/tests/arith.stderr.exp

diff --git a/exp-ptrcheck/tests/arith.vgtest-disabled b/exp-sgcheck/tests/arith.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/arith.vgtest-disabled
rename to exp-sgcheck/tests/arith.vgtest-disabled

diff --git a/exp-ptrcheck/tests/arith_include1.c b/exp-sgcheck/tests/arith_include1.c
similarity index 100%
rename from exp-ptrcheck/tests/arith_include1.c
rename to exp-sgcheck/tests/arith_include1.c

diff --git a/exp-ptrcheck/tests/arith_include2.c b/exp-sgcheck/tests/arith_include2.c
similarity index 100%
rename from exp-ptrcheck/tests/arith_include2.c
rename to exp-sgcheck/tests/arith_include2.c

diff --git a/exp-ptrcheck/tests/bad_percentify.c b/exp-sgcheck/tests/bad_percentify.c
similarity index 100%
rename from exp-ptrcheck/tests/bad_percentify.c
rename to exp-sgcheck/tests/bad_percentify.c

diff --git a/exp-ptrcheck/tests/bad_percentify.stderr.exp-glibc28-amd64 b/exp-sgcheck/tests/bad_percentify.stderr.exp-glibc28-amd64
similarity index 100%
rename from exp-ptrcheck/tests/bad_percentify.stderr.exp-glibc28-amd64
rename to exp-sgcheck/tests/bad_percentify.stderr.exp-glibc28-amd64

diff --git a/exp-ptrcheck/tests/bad_percentify.stdout.exp b/exp-sgcheck/tests/bad_percentify.stdout.exp
similarity index 100%
rename from exp-ptrcheck/tests/bad_percentify.stdout.exp
rename to exp-sgcheck/tests/bad_percentify.stdout.exp

diff --git a/exp-ptrcheck/tests/bad_percentify.vgtest b/exp-sgcheck/tests/bad_percentify.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/bad_percentify.vgtest
rename to exp-sgcheck/tests/bad_percentify.vgtest

diff --git a/exp-ptrcheck/tests/base.c b/exp-sgcheck/tests/base.c
similarity index 100%
rename from exp-ptrcheck/tests/base.c
rename to exp-sgcheck/tests/base.c

diff --git a/exp-ptrcheck/tests/base.stderr.exp-glibc25-amd64 b/exp-sgcheck/tests/base.stderr.exp-glibc25-amd64
similarity index 100%
rename from exp-ptrcheck/tests/base.stderr.exp-glibc25-amd64
rename to exp-sgcheck/tests/base.stderr.exp-glibc25-amd64

diff --git a/exp-ptrcheck/tests/base.stderr.exp-glibc25-x86 b/exp-sgcheck/tests/base.stderr.exp-glibc25-x86
similarity index 100%
rename from exp-ptrcheck/tests/base.stderr.exp-glibc25-x86
rename to exp-sgcheck/tests/base.stderr.exp-glibc25-x86

diff --git a/exp-ptrcheck/tests/base.vgtest b/exp-sgcheck/tests/base.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/base.vgtest
rename to exp-sgcheck/tests/base.vgtest

diff --git a/exp-ptrcheck/tests/ccc.cpp b/exp-sgcheck/tests/ccc.cpp
similarity index 100%
rename from exp-ptrcheck/tests/ccc.cpp
rename to exp-sgcheck/tests/ccc.cpp

diff --git a/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64 b/exp-sgcheck/tests/ccc.stderr.exp-glibc25-amd64
similarity index 100%
rename from exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64
rename to exp-sgcheck/tests/ccc.stderr.exp-glibc25-amd64

diff --git a/exp-ptrcheck/tests/ccc.stderr.exp-glibc27-x86 b/exp-sgcheck/tests/ccc.stderr.exp-glibc27-x86
similarity index 100%
rename from exp-ptrcheck/tests/ccc.stderr.exp-glibc27-x86
rename to exp-sgcheck/tests/ccc.stderr.exp-glibc27-x86

diff --git a/exp-ptrcheck/tests/ccc.stderr.exp-glibc28-amd64 b/exp-sgcheck/tests/ccc.stderr.exp-glibc28-amd64
similarity index 100%
rename from exp-ptrcheck/tests/ccc.stderr.exp-glibc28-amd64
rename to exp-sgcheck/tests/ccc.stderr.exp-glibc28-amd64

diff --git a/exp-ptrcheck/tests/ccc.vgtest b/exp-sgcheck/tests/ccc.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/ccc.vgtest
rename to exp-sgcheck/tests/ccc.vgtest

diff --git a/exp-ptrcheck/tests/cmp.c b/exp-sgcheck/tests/cmp.c
similarity index 100%
rename from exp-ptrcheck/tests/cmp.c
rename to exp-sgcheck/tests/cmp.c

diff --git a/exp-ptrcheck/tests/cmp.stderr.exp b/exp-sgcheck/tests/cmp.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/cmp.stderr.exp
rename to exp-sgcheck/tests/cmp.stderr.exp

diff --git a/exp-ptrcheck/tests/cmp.vgtest-disabled b/exp-sgcheck/tests/cmp.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/cmp.vgtest-disabled
rename to exp-sgcheck/tests/cmp.vgtest-disabled

diff --git a/exp-ptrcheck/tests/filter_add b/exp-sgcheck/tests/filter_add
similarity index 100%
rename from exp-ptrcheck/tests/filter_add
rename to exp-sgcheck/tests/filter_add

diff --git a/exp-ptrcheck/tests/filter_stderr b/exp-sgcheck/tests/filter_stderr
similarity index 100%
rename from exp-ptrcheck/tests/filter_stderr
rename to exp-sgcheck/tests/filter_stderr

diff --git a/exp-ptrcheck/tests/filter_suppgen b/exp-sgcheck/tests/filter_suppgen
similarity index 100%
rename from exp-ptrcheck/tests/filter_suppgen
rename to exp-sgcheck/tests/filter_suppgen

diff --git a/exp-ptrcheck/tests/fp.c b/exp-sgcheck/tests/fp.c
similarity index 100%
rename from exp-ptrcheck/tests/fp.c
rename to exp-sgcheck/tests/fp.c

diff --git a/exp-ptrcheck/tests/fp.stderr.exp b/exp-sgcheck/tests/fp.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/fp.stderr.exp
rename to exp-sgcheck/tests/fp.stderr.exp

diff --git a/exp-ptrcheck/tests/fp.vgtest b/exp-sgcheck/tests/fp.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/fp.vgtest
rename to exp-sgcheck/tests/fp.vgtest

diff --git a/exp-ptrcheck/tests/globalerr.c b/exp-sgcheck/tests/globalerr.c
similarity index 100%
rename from exp-ptrcheck/tests/globalerr.c
rename to exp-sgcheck/tests/globalerr.c

diff --git a/exp-ptrcheck/tests/globalerr.stderr.exp-glibc28-amd64 b/exp-sgcheck/tests/globalerr.stderr.exp-glibc28-amd64
similarity index 100%
rename from exp-ptrcheck/tests/globalerr.stderr.exp-glibc28-amd64
rename to exp-sgcheck/tests/globalerr.stderr.exp-glibc28-amd64

diff --git a/exp-ptrcheck/tests/globalerr.stdout.exp b/exp-sgcheck/tests/globalerr.stdout.exp
similarity index 100%
rename from exp-ptrcheck/tests/globalerr.stdout.exp
rename to exp-sgcheck/tests/globalerr.stdout.exp

diff --git a/exp-ptrcheck/tests/globalerr.vgtest b/exp-sgcheck/tests/globalerr.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/globalerr.vgtest
rename to exp-sgcheck/tests/globalerr.vgtest

diff --git a/exp-ptrcheck/tests/hackedbz2.c b/exp-sgcheck/tests/hackedbz2.c
similarity index 100%
rename from exp-ptrcheck/tests/hackedbz2.c
rename to exp-sgcheck/tests/hackedbz2.c

diff --git a/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64 b/exp-sgcheck/tests/hackedbz2.stderr.exp-glibc28-amd64
similarity index 100%
rename from exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64
rename to exp-sgcheck/tests/hackedbz2.stderr.exp-glibc28-amd64

diff --git a/exp-ptrcheck/tests/hackedbz2.stdout.exp b/exp-sgcheck/tests/hackedbz2.stdout.exp
similarity index 100%
rename from exp-ptrcheck/tests/hackedbz2.stdout.exp
rename to exp-sgcheck/tests/hackedbz2.stdout.exp

diff --git a/exp-ptrcheck/tests/hackedbz2.vgtest b/exp-sgcheck/tests/hackedbz2.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/hackedbz2.vgtest
rename to exp-sgcheck/tests/hackedbz2.vgtest

diff --git a/exp-ptrcheck/tests/hp_bounds.c b/exp-sgcheck/tests/hp_bounds.c
similarity index 100%
rename from exp-ptrcheck/tests/hp_bounds.c
rename to exp-sgcheck/tests/hp_bounds.c

diff --git a/exp-ptrcheck/tests/hp_bounds.stderr.exp b/exp-sgcheck/tests/hp_bounds.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/hp_bounds.stderr.exp
rename to exp-sgcheck/tests/hp_bounds.stderr.exp

diff --git a/exp-ptrcheck/tests/hp_bounds.vgtest b/exp-sgcheck/tests/hp_bounds.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/hp_bounds.vgtest
rename to exp-sgcheck/tests/hp_bounds.vgtest

diff --git a/exp-ptrcheck/tests/hp_dangle.c b/exp-sgcheck/tests/hp_dangle.c
similarity index 100%
rename from exp-ptrcheck/tests/hp_dangle.c
rename to exp-sgcheck/tests/hp_dangle.c

diff --git a/exp-ptrcheck/tests/hp_dangle.stderr.exp b/exp-sgcheck/tests/hp_dangle.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/hp_dangle.stderr.exp
rename to exp-sgcheck/tests/hp_dangle.stderr.exp

diff --git a/exp-ptrcheck/tests/hp_dangle.vgtest b/exp-sgcheck/tests/hp_dangle.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/hp_dangle.vgtest
rename to exp-sgcheck/tests/hp_dangle.vgtest

diff --git a/exp-ptrcheck/tests/hsg.c b/exp-sgcheck/tests/hsg.c
similarity index 100%
rename from exp-ptrcheck/tests/hsg.c
rename to exp-sgcheck/tests/hsg.c

diff --git a/exp-ptrcheck/tests/hsg.stderr.exp b/exp-sgcheck/tests/hsg.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/hsg.stderr.exp
rename to exp-sgcheck/tests/hsg.stderr.exp

diff --git a/exp-ptrcheck/tests/hsg.stdout.exp b/exp-sgcheck/tests/hsg.stdout.exp
similarity index 100%
rename from exp-ptrcheck/tests/hsg.stdout.exp
rename to exp-sgcheck/tests/hsg.stdout.exp

diff --git a/exp-ptrcheck/tests/hsg.vgtest b/exp-sgcheck/tests/hsg.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/hsg.vgtest
rename to exp-sgcheck/tests/hsg.vgtest

diff --git a/exp-ptrcheck/tests/idiv.c b/exp-sgcheck/tests/idiv.c
similarity index 100%
rename from exp-ptrcheck/tests/idiv.c
rename to exp-sgcheck/tests/idiv.c

diff --git a/exp-ptrcheck/tests/idiv.stderr.exp b/exp-sgcheck/tests/idiv.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/idiv.stderr.exp
rename to exp-sgcheck/tests/idiv.stderr.exp

diff --git a/exp-ptrcheck/tests/idiv.vgtest-disabled b/exp-sgcheck/tests/idiv.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/idiv.vgtest-disabled
rename to exp-sgcheck/tests/idiv.vgtest-disabled

diff --git a/exp-ptrcheck/tests/imul.c b/exp-sgcheck/tests/imul.c
similarity index 100%
rename from exp-ptrcheck/tests/imul.c
rename to exp-sgcheck/tests/imul.c

diff --git a/exp-ptrcheck/tests/imul.stderr.exp b/exp-sgcheck/tests/imul.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/imul.stderr.exp
rename to exp-sgcheck/tests/imul.stderr.exp

diff --git a/exp-ptrcheck/tests/imul.vgtest-disabled b/exp-sgcheck/tests/imul.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/imul.vgtest-disabled
rename to exp-sgcheck/tests/imul.vgtest-disabled

diff --git a/exp-ptrcheck/tests/is_arch_supported b/exp-sgcheck/tests/is_arch_supported
similarity index 100%
rename from exp-ptrcheck/tests/is_arch_supported
rename to exp-sgcheck/tests/is_arch_supported

diff --git a/exp-ptrcheck/tests/justify.c b/exp-sgcheck/tests/justify.c
similarity index 100%
rename from exp-ptrcheck/tests/justify.c
rename to exp-sgcheck/tests/justify.c

diff --git a/exp-ptrcheck/tests/justify.stderr.exp b/exp-sgcheck/tests/justify.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/justify.stderr.exp
rename to exp-sgcheck/tests/justify.stderr.exp

diff --git a/exp-ptrcheck/tests/justify.vgtest b/exp-sgcheck/tests/justify.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/justify.vgtest
rename to exp-sgcheck/tests/justify.vgtest

diff --git a/exp-ptrcheck/tests/mm.c b/exp-sgcheck/tests/mm.c
similarity index 100%
rename from exp-ptrcheck/tests/mm.c
rename to exp-sgcheck/tests/mm.c

diff --git a/exp-ptrcheck/tests/mm.stderr.exp b/exp-sgcheck/tests/mm.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/mm.stderr.exp
rename to exp-sgcheck/tests/mm.stderr.exp

diff --git a/exp-ptrcheck/tests/mm.vgtest-disabled b/exp-sgcheck/tests/mm.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/mm.vgtest-disabled
rename to exp-sgcheck/tests/mm.vgtest-disabled

diff --git a/exp-ptrcheck/tests/neg.c b/exp-sgcheck/tests/neg.c
similarity index 100%
rename from exp-ptrcheck/tests/neg.c
rename to exp-sgcheck/tests/neg.c

diff --git a/exp-ptrcheck/tests/neg.stderr.exp b/exp-sgcheck/tests/neg.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/neg.stderr.exp
rename to exp-sgcheck/tests/neg.stderr.exp

diff --git a/exp-ptrcheck/tests/neg.vgtest-disabled b/exp-sgcheck/tests/neg.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/neg.vgtest-disabled
rename to exp-sgcheck/tests/neg.vgtest-disabled

diff --git a/exp-ptrcheck/tests/not.c b/exp-sgcheck/tests/not.c
similarity index 100%
rename from exp-ptrcheck/tests/not.c
rename to exp-sgcheck/tests/not.c

diff --git a/exp-ptrcheck/tests/not.stderr.exp b/exp-sgcheck/tests/not.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/not.stderr.exp
rename to exp-sgcheck/tests/not.stderr.exp

diff --git a/exp-ptrcheck/tests/not.vgtest-disabled b/exp-sgcheck/tests/not.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/not.vgtest-disabled
rename to exp-sgcheck/tests/not.vgtest-disabled

diff --git a/exp-ptrcheck/tests/or.c b/exp-sgcheck/tests/or.c
similarity index 100%
rename from exp-ptrcheck/tests/or.c
rename to exp-sgcheck/tests/or.c

diff --git a/exp-ptrcheck/tests/or.stderr.exp b/exp-sgcheck/tests/or.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/or.stderr.exp
rename to exp-sgcheck/tests/or.stderr.exp

diff --git a/exp-ptrcheck/tests/or.vgtest-disabled b/exp-sgcheck/tests/or.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/or.vgtest-disabled
rename to exp-sgcheck/tests/or.vgtest-disabled

diff --git a/exp-ptrcheck/tests/partial.c b/exp-sgcheck/tests/partial.c
similarity index 100%
rename from exp-ptrcheck/tests/partial.c
rename to exp-sgcheck/tests/partial.c

diff --git a/exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-amd64 b/exp-sgcheck/tests/partial_bad.stderr.exp-glibc25-amd64
similarity index 100%
rename from exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-amd64
rename to exp-sgcheck/tests/partial_bad.stderr.exp-glibc25-amd64

diff --git a/exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-x86 b/exp-sgcheck/tests/partial_bad.stderr.exp-glibc25-x86
similarity index 100%
rename from exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-x86
rename to exp-sgcheck/tests/partial_bad.stderr.exp-glibc25-x86

diff --git a/exp-ptrcheck/tests/partial_bad.vgtest b/exp-sgcheck/tests/partial_bad.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/partial_bad.vgtest
rename to exp-sgcheck/tests/partial_bad.vgtest

diff --git a/exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-amd64 b/exp-sgcheck/tests/partial_good.stderr.exp-glibc25-amd64
similarity index 100%
rename from exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-amd64
rename to exp-sgcheck/tests/partial_good.stderr.exp-glibc25-amd64

diff --git a/exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-x86 b/exp-sgcheck/tests/partial_good.stderr.exp-glibc25-x86
similarity index 100%
rename from exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-x86
rename to exp-sgcheck/tests/partial_good.stderr.exp-glibc25-x86

diff --git a/exp-ptrcheck/tests/partial_good.vgtest b/exp-sgcheck/tests/partial_good.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/partial_good.vgtest
rename to exp-sgcheck/tests/partial_good.vgtest

diff --git a/exp-ptrcheck/tests/preen_invars.c b/exp-sgcheck/tests/preen_invars.c
similarity index 100%
rename from exp-ptrcheck/tests/preen_invars.c
rename to exp-sgcheck/tests/preen_invars.c

diff --git a/exp-ptrcheck/tests/preen_invars.stderr.exp-glibc28-amd64 b/exp-sgcheck/tests/preen_invars.stderr.exp-glibc28-amd64
similarity index 100%
rename from exp-ptrcheck/tests/preen_invars.stderr.exp-glibc28-amd64
rename to exp-sgcheck/tests/preen_invars.stderr.exp-glibc28-amd64

diff --git a/exp-ptrcheck/tests/preen_invars.stdout.exp b/exp-sgcheck/tests/preen_invars.stdout.exp
similarity index 100%
rename from exp-ptrcheck/tests/preen_invars.stdout.exp
rename to exp-sgcheck/tests/preen_invars.stdout.exp

diff --git a/exp-ptrcheck/tests/preen_invars.vgtest b/exp-sgcheck/tests/preen_invars.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/preen_invars.vgtest
rename to exp-sgcheck/tests/preen_invars.vgtest

diff --git a/exp-ptrcheck/tests/preen_invars_so.c b/exp-sgcheck/tests/preen_invars_so.c
similarity index 100%
rename from exp-ptrcheck/tests/preen_invars_so.c
rename to exp-sgcheck/tests/preen_invars_so.c

diff --git a/exp-ptrcheck/tests/pth_create.c b/exp-sgcheck/tests/pth_create.c
similarity index 100%
rename from exp-ptrcheck/tests/pth_create.c
rename to exp-sgcheck/tests/pth_create.c

diff --git a/exp-ptrcheck/tests/pth_create.stderr.exp b/exp-sgcheck/tests/pth_create.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/pth_create.stderr.exp
rename to exp-sgcheck/tests/pth_create.stderr.exp

diff --git a/exp-ptrcheck/tests/pth_create.vgtest b/exp-sgcheck/tests/pth_create.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/pth_create.vgtest
rename to exp-sgcheck/tests/pth_create.vgtest

diff --git a/exp-ptrcheck/tests/pth_specific.c b/exp-sgcheck/tests/pth_specific.c
similarity index 100%
rename from exp-ptrcheck/tests/pth_specific.c
rename to exp-sgcheck/tests/pth_specific.c

diff --git a/exp-ptrcheck/tests/pth_specific.stderr.exp b/exp-sgcheck/tests/pth_specific.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/pth_specific.stderr.exp
rename to exp-sgcheck/tests/pth_specific.stderr.exp

diff --git a/exp-ptrcheck/tests/pth_specific.vgtest b/exp-sgcheck/tests/pth_specific.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/pth_specific.vgtest
rename to exp-sgcheck/tests/pth_specific.vgtest

diff --git a/exp-ptrcheck/tests/realloc.c b/exp-sgcheck/tests/realloc.c
similarity index 100%
rename from exp-ptrcheck/tests/realloc.c
rename to exp-sgcheck/tests/realloc.c

diff --git a/exp-ptrcheck/tests/realloc.stderr.exp-glibc25-amd64 b/exp-sgcheck/tests/realloc.stderr.exp-glibc25-amd64
similarity index 100%
rename from exp-ptrcheck/tests/realloc.stderr.exp-glibc25-amd64
rename to exp-sgcheck/tests/realloc.stderr.exp-glibc25-amd64

diff --git a/exp-ptrcheck/tests/realloc.stderr.exp-glibc25-x86 b/exp-sgcheck/tests/realloc.stderr.exp-glibc25-x86
similarity index 100%
rename from exp-ptrcheck/tests/realloc.stderr.exp-glibc25-x86
rename to exp-sgcheck/tests/realloc.stderr.exp-glibc25-x86

diff --git a/exp-ptrcheck/tests/realloc.vgtest b/exp-sgcheck/tests/realloc.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/realloc.vgtest
rename to exp-sgcheck/tests/realloc.vgtest

diff --git a/exp-ptrcheck/tests/sh_script b/exp-sgcheck/tests/sh_script
similarity index 100%
rename from exp-ptrcheck/tests/sh_script
rename to exp-sgcheck/tests/sh_script

diff --git a/exp-ptrcheck/tests/sh_script.stderr.exp b/exp-sgcheck/tests/sh_script.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/sh_script.stderr.exp
rename to exp-sgcheck/tests/sh_script.stderr.exp

diff --git a/exp-ptrcheck/tests/sh_script.vgtest-disabled b/exp-sgcheck/tests/sh_script.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/sh_script.vgtest-disabled
rename to exp-sgcheck/tests/sh_script.vgtest-disabled

diff --git a/exp-ptrcheck/tests/stackerr.c b/exp-sgcheck/tests/stackerr.c
similarity index 100%
rename from exp-ptrcheck/tests/stackerr.c
rename to exp-sgcheck/tests/stackerr.c

diff --git a/exp-ptrcheck/tests/stackerr.stderr.exp-glibc27-x86 b/exp-sgcheck/tests/stackerr.stderr.exp-glibc27-x86
similarity index 100%
rename from exp-ptrcheck/tests/stackerr.stderr.exp-glibc27-x86
rename to exp-sgcheck/tests/stackerr.stderr.exp-glibc27-x86

diff --git a/exp-ptrcheck/tests/stackerr.stderr.exp-glibc28-amd64 b/exp-sgcheck/tests/stackerr.stderr.exp-glibc28-amd64
similarity index 100%
rename from exp-ptrcheck/tests/stackerr.stderr.exp-glibc28-amd64
rename to exp-sgcheck/tests/stackerr.stderr.exp-glibc28-amd64

diff --git a/exp-ptrcheck/tests/stackerr.stdout.exp b/exp-sgcheck/tests/stackerr.stdout.exp
similarity index 100%
rename from exp-ptrcheck/tests/stackerr.stdout.exp
rename to exp-sgcheck/tests/stackerr.stdout.exp

diff --git a/exp-ptrcheck/tests/stackerr.vgtest b/exp-sgcheck/tests/stackerr.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/stackerr.vgtest
rename to exp-sgcheck/tests/stackerr.vgtest

diff --git a/exp-ptrcheck/tests/strcpy.c b/exp-sgcheck/tests/strcpy.c
similarity index 100%
rename from exp-ptrcheck/tests/strcpy.c
rename to exp-sgcheck/tests/strcpy.c

diff --git a/exp-ptrcheck/tests/strcpy.stderr.exp b/exp-sgcheck/tests/strcpy.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/strcpy.stderr.exp
rename to exp-sgcheck/tests/strcpy.stderr.exp

diff --git a/exp-ptrcheck/tests/strcpy.vgtest b/exp-sgcheck/tests/strcpy.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/strcpy.vgtest
rename to exp-sgcheck/tests/strcpy.vgtest

diff --git a/exp-ptrcheck/tests/strlen.c b/exp-sgcheck/tests/strlen.c
similarity index 100%
rename from exp-ptrcheck/tests/strlen.c
rename to exp-sgcheck/tests/strlen.c

diff --git a/exp-ptrcheck/tests/strlen_bad.stderr.exp b/exp-sgcheck/tests/strlen_bad.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/strlen_bad.stderr.exp
rename to exp-sgcheck/tests/strlen_bad.stderr.exp

diff --git a/exp-ptrcheck/tests/strlen_bad.vgtest-disabled b/exp-sgcheck/tests/strlen_bad.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/strlen_bad.vgtest-disabled
rename to exp-sgcheck/tests/strlen_bad.vgtest-disabled

diff --git a/exp-ptrcheck/tests/strlen_good.stderr.exp b/exp-sgcheck/tests/strlen_good.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/strlen_good.stderr.exp
rename to exp-sgcheck/tests/strlen_good.stderr.exp

diff --git a/exp-ptrcheck/tests/strlen_good.vgtest-disabled b/exp-sgcheck/tests/strlen_good.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/strlen_good.vgtest-disabled
rename to exp-sgcheck/tests/strlen_good.vgtest-disabled

diff --git a/exp-ptrcheck/tests/sub.c b/exp-sgcheck/tests/sub.c
similarity index 100%
rename from exp-ptrcheck/tests/sub.c
rename to exp-sgcheck/tests/sub.c

diff --git a/exp-ptrcheck/tests/sub.stderr.exp b/exp-sgcheck/tests/sub.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/sub.stderr.exp
rename to exp-sgcheck/tests/sub.stderr.exp

diff --git a/exp-ptrcheck/tests/sub.vgtest-disabled b/exp-sgcheck/tests/sub.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/sub.vgtest-disabled
rename to exp-sgcheck/tests/sub.vgtest-disabled

diff --git a/exp-ptrcheck/tests/supp.c b/exp-sgcheck/tests/supp.c
similarity index 100%
rename from exp-ptrcheck/tests/supp.c
rename to exp-sgcheck/tests/supp.c

diff --git a/exp-ptrcheck/tests/supp.stderr.exp b/exp-sgcheck/tests/supp.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/supp.stderr.exp
rename to exp-sgcheck/tests/supp.stderr.exp

diff --git a/exp-ptrcheck/tests/supp.supp b/exp-sgcheck/tests/supp.supp
similarity index 100%
rename from exp-ptrcheck/tests/supp.supp
rename to exp-sgcheck/tests/supp.supp

diff --git a/exp-ptrcheck/tests/supp.vgtest b/exp-sgcheck/tests/supp.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/supp.vgtest
rename to exp-sgcheck/tests/supp.vgtest

diff --git a/exp-ptrcheck/tests/suppgen.stderr.exp b/exp-sgcheck/tests/suppgen.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/suppgen.stderr.exp
rename to exp-sgcheck/tests/suppgen.stderr.exp

diff --git a/exp-ptrcheck/tests/suppgen.stdin b/exp-sgcheck/tests/suppgen.stdin
similarity index 100%
rename from exp-ptrcheck/tests/suppgen.stdin
rename to exp-sgcheck/tests/suppgen.stdin

diff --git a/exp-ptrcheck/tests/suppgen.vgtest-disabled b/exp-sgcheck/tests/suppgen.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/suppgen.vgtest-disabled
rename to exp-sgcheck/tests/suppgen.vgtest-disabled

diff --git a/exp-ptrcheck/tests/syscall.c b/exp-sgcheck/tests/syscall.c
similarity index 100%
rename from exp-ptrcheck/tests/syscall.c
rename to exp-sgcheck/tests/syscall.c

diff --git a/exp-ptrcheck/tests/syscall.stderr.exp b/exp-sgcheck/tests/syscall.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/syscall.stderr.exp
rename to exp-sgcheck/tests/syscall.stderr.exp

diff --git a/exp-ptrcheck/tests/syscall.vgtest-disabled b/exp-sgcheck/tests/syscall.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/syscall.vgtest-disabled
rename to exp-sgcheck/tests/syscall.vgtest-disabled

diff --git a/exp-ptrcheck/tests/tricky.c b/exp-sgcheck/tests/tricky.c
similarity index 100%
rename from exp-ptrcheck/tests/tricky.c
rename to exp-sgcheck/tests/tricky.c

diff --git a/exp-ptrcheck/tests/tricky.stderr.exp b/exp-sgcheck/tests/tricky.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/tricky.stderr.exp
rename to exp-sgcheck/tests/tricky.stderr.exp

diff --git a/exp-ptrcheck/tests/tricky.vgtest b/exp-sgcheck/tests/tricky.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/tricky.vgtest
rename to exp-sgcheck/tests/tricky.vgtest

diff --git a/exp-ptrcheck/tests/unaligned.c b/exp-sgcheck/tests/unaligned.c
similarity index 100%
rename from exp-ptrcheck/tests/unaligned.c
rename to exp-sgcheck/tests/unaligned.c

diff --git a/exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-amd64 b/exp-sgcheck/tests/unaligned.stderr.exp-glibc25-amd64
similarity index 100%
rename from exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-amd64
rename to exp-sgcheck/tests/unaligned.stderr.exp-glibc25-amd64

diff --git a/exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-x86 b/exp-sgcheck/tests/unaligned.stderr.exp-glibc25-x86
similarity index 100%
rename from exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-x86
rename to exp-sgcheck/tests/unaligned.stderr.exp-glibc25-x86

diff --git a/exp-ptrcheck/tests/unaligned.vgtest b/exp-sgcheck/tests/unaligned.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/unaligned.vgtest
rename to exp-sgcheck/tests/unaligned.vgtest

diff --git a/exp-ptrcheck/tests/xor.c b/exp-sgcheck/tests/xor.c
similarity index 100%
rename from exp-ptrcheck/tests/xor.c
rename to exp-sgcheck/tests/xor.c

diff --git a/exp-ptrcheck/tests/xor.stderr.exp b/exp-sgcheck/tests/xor.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/xor.stderr.exp
rename to exp-sgcheck/tests/xor.stderr.exp

diff --git a/exp-ptrcheck/tests/xor.vgtest-disabled b/exp-sgcheck/tests/xor.vgtest-disabled
similarity index 100%
rename from exp-ptrcheck/tests/xor.vgtest-disabled
rename to exp-sgcheck/tests/xor.vgtest-disabled

diff --git a/exp-ptrcheck/tests/zero.c b/exp-sgcheck/tests/zero.c
similarity index 100%
rename from exp-ptrcheck/tests/zero.c
rename to exp-sgcheck/tests/zero.c

diff --git a/exp-ptrcheck/tests/zero.stderr.exp b/exp-sgcheck/tests/zero.stderr.exp
similarity index 100%
rename from exp-ptrcheck/tests/zero.stderr.exp
rename to exp-sgcheck/tests/zero.stderr.exp

diff --git a/exp-ptrcheck/tests/zero.vgtest b/exp-sgcheck/tests/zero.vgtest
similarity index 100%
rename from exp-ptrcheck/tests/zero.vgtest
rename to exp-sgcheck/tests/zero.vgtest