Update dmapi test suite, add Makefiles, remove Conscript files.

[xfstests-dev.git] / dmapi / src / suite2 / src / check_dmapi.c

diff --git a/dmapi/src/suite2/src/check_dmapi.c b/dmapi/src/suite2/src/check_dmapi.c
index ddd977d2abf8ae05114e4c4e1611bbcfffbb7f7d..d6849e7469621df5c8328ac3da29b2a79eb3aaaf 100644 (file)
--- a/dmapi/src/suite2/src/check_dmapi.c
+++ b/dmapi/src/suite2/src/check_dmapi.c
@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef linux
-#include <linux/dmapi_kern.h>
+#include <dmapi.h>
 #else
 #include <sys/dmi.h>
 #endif
@@ -141,11 +141,9 @@ main(
         * EXAMINE /usr/include/sys/dmi.h:
         *--------------------------------
         */
-#ifdef linux
-#define DMAPI_HDR "/usr/include/linux/dmapi.h"
-#else
+#ifdef __sgi
 #define DMAPI_HDR "/usr/include/sys/dmi.h"
-#endif
+
        if (stat(DMAPI_HDR, &stat_buf)==-1){
          if (errno==ENOENT) { 
            printf( "You are missing a vital DMAPI file: %s\n", DMAPI_HDR);
@@ -162,6 +160,7 @@ main(
            printf("(You appear to have the correct version of %s\n", DMAPI_HDR);
          }
        }
+#endif
        
        /*--------------------------
         * RESOLVE KERNEL PRESENCE: