Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7364] teem/trunk
|
From: <kin...@us...> - 2025-09-06 01:59:37
|
Revision: 7364
http://sourceforge.net/p/teem/code/7364
Author: kindlmann
Date: 2025-09-06 01:59:34 +0000 (Sat, 06 Sep 2025)
Log Message:
-----------
moving files around
Added Paths:
-----------
teem/trunk/tests/
teem/trunk/tests/ctest/
teem/trunk/tests/ctest/CMakeLists.txt
teem/trunk/tests/ctest/air/
teem/trunk/tests/ctest/biff/
teem/trunk/tests/ctest/gage/
teem/trunk/tests/ctest/meet/
teem/trunk/tests/ctest/nrrd/
teem/trunk/tests/ctest/ten/
teem/trunk/tests/ctest/testDataPath.h.in
teem/trunk/tests/ctest/unrrdu/
Removed Paths:
-------------
teem/trunk/Testing/
teem/trunk/tests/CMakeLists.txt
teem/trunk/tests/air/
teem/trunk/tests/biff/
teem/trunk/tests/gage/
teem/trunk/tests/meet/
teem/trunk/tests/nrrd/
teem/trunk/tests/ten/
teem/trunk/tests/testDataPath.h.in
teem/trunk/tests/unrrdu/
Deleted: teem/trunk/tests/CMakeLists.txt
===================================================================
--- teem/trunk/Testing/CMakeLists.txt 2025-09-05 17:48:54 UTC (rev 7363)
+++ teem/trunk/tests/CMakeLists.txt 2025-09-06 01:59:34 UTC (rev 7364)
@@ -1,68 +0,0 @@
-#
-# Teem: Tools to process and visualize scientific data and images
-# Copyright (C) 2009--2025 University of Chicago
-# Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
-# Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# (LGPL) as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# The terms of redistributing and/or modifying this software also
-# include exceptions to the LGPL that facilitate static linking.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, see <https://www.gnu.org/licenses/>.
-#
-
-project(TEEMTesting)
-
-# Create a header file with the path to the data in it. Note that we don't
-# have to make these paths "windows friendly" as it turns out windows can read
-# forward slashed paths.
-set(TESTING_DATA_PATH "${CMAKE_SOURCE_DIR}/data" CACHE PATH
- "Path to testing data")
-mark_as_advanced(TESTING_DATA_PATH)
-
-configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/testDataPath.h.in"
- "${CMAKE_BINARY_DIR}/include/testDataPath.h"
- )
-
-# nrrdSanity the executable is no longer (as of Teem v2) built;
-# so this is being removed. Lots of tests will immediately fail
-# if nrrdSanity() (the function) fails.
-## This just runs nrrdSanity as test called "nrrd.Sanity"
-## We don't do the same for airSanity because that's an
-## "experimental app" . . .
-# add_test(NAME nrrd.Sanity COMMAND $<TARGET_FILE:nrrdSanity>)
-
-# Hope to eventually have tests in all directories; until then
-# many of these are commented out. (TEEM_LIB_LIST)
-add_subdirectory(air)
-# add_subdirectory(hest)
-add_subdirectory(biff)
-add_subdirectory(nrrd)
-# add_subdirectory(ell)
-# add_subdirectory(moss)
-add_subdirectory(unrrdu)
-# add_subdirectory(alan)
-# add_subdirectory(tijk)
-add_subdirectory(gage)
-# add_subdirectory(dye)
-# add_subdirectory(bane)
-# add_subdirectory(limn)
-# add_subdirectory(echo)
-# add_subdirectory(hoover)
-# add_subdirectory(seek)
-add_subdirectory(ten)
-# add_subdirectory(elf)
-# add_subdirectory(pull)
-# add_subdirectory(coil)
-# add_subdirectory(push)
-# add_subdirectory(mite)
-add_subdirectory(meet)
Copied: teem/trunk/tests/ctest/CMakeLists.txt (from rev 7363, teem/trunk/Testing/CMakeLists.txt)
===================================================================
--- teem/trunk/tests/ctest/CMakeLists.txt (rev 0)
+++ teem/trunk/tests/ctest/CMakeLists.txt 2025-09-06 01:59:34 UTC (rev 7364)
@@ -0,0 +1,68 @@
+#
+# Teem: Tools to process and visualize scientific data and images
+# Copyright (C) 2009--2025 University of Chicago
+# Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
+# Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# (LGPL) as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# The terms of redistributing and/or modifying this software also
+# include exceptions to the LGPL that facilitate static linking.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, see <https://www.gnu.org/licenses/>.
+#
+
+project(TEEMTesting)
+
+# Create a header file with the path to the data in it. Note that we don't
+# have to make these paths "windows friendly" as it turns out windows can read
+# forward slashed paths.
+set(TESTING_DATA_PATH "${CMAKE_SOURCE_DIR}/data" CACHE PATH
+ "Path to testing data")
+mark_as_advanced(TESTING_DATA_PATH)
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/testDataPath.h.in"
+ "${CMAKE_BINARY_DIR}/include/testDataPath.h"
+ )
+
+# nrrdSanity the executable is no longer (as of Teem v2) built;
+# so this is being removed. Lots of tests will immediately fail
+# if nrrdSanity() (the function) fails.
+## This just runs nrrdSanity as test called "nrrd.Sanity"
+## We don't do the same for airSanity because that's an
+## "experimental app" . . .
+# add_test(NAME nrrd.Sanity COMMAND $<TARGET_FILE:nrrdSanity>)
+
+# Hope to eventually have tests in all directories; until then
+# many of these are commented out. (TEEM_LIB_LIST)
+add_subdirectory(air)
+# add_subdirectory(hest)
+add_subdirectory(biff)
+add_subdirectory(nrrd)
+# add_subdirectory(ell)
+# add_subdirectory(moss)
+add_subdirectory(unrrdu)
+# add_subdirectory(alan)
+# add_subdirectory(tijk)
+add_subdirectory(gage)
+# add_subdirectory(dye)
+# add_subdirectory(bane)
+# add_subdirectory(limn)
+# add_subdirectory(echo)
+# add_subdirectory(hoover)
+# add_subdirectory(seek)
+add_subdirectory(ten)
+# add_subdirectory(elf)
+# add_subdirectory(pull)
+# add_subdirectory(coil)
+# add_subdirectory(push)
+# add_subdirectory(mite)
+add_subdirectory(meet)
Copied: teem/trunk/tests/ctest/testDataPath.h.in (from rev 7363, teem/trunk/Testing/testDataPath.h.in)
===================================================================
--- teem/trunk/tests/ctest/testDataPath.h.in (rev 0)
+++ teem/trunk/tests/ctest/testDataPath.h.in 2025-09-06 01:59:34 UTC (rev 7364)
@@ -0,0 +1,61 @@
+/*
+ Teem: Tools to process and visualize scientific data and images
+ Copyright (C) 2009--2019 University of Chicago
+ Copyright (C) 2011 James Bigler
+ Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
+ Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ (LGPL) as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ The terms of redistributing and/or modifying this software also
+ include exceptions to the LGPL that facilitate static linking.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <https://www.gnu.org/licenses/>.
+*/
+
+#define TESTING_DATA_PATH "${TESTING_DATA_PATH}"
+
+#include <stdlib.h>
+#include <string.h>
+#include <teem/air.h>
+
+/*
+** testDataPathPrefix allocates and returns a string which is
+** the given "base" prefixed with the path to the test datasets,
+** including the "/" between the path and "base". Caller is
+** responsible for freeing.
+**
+** Thanks to James Bigler for writing the first version of this.
+*/
+static char*
+testDataPathPrefix(const char* base) {
+ size_t pathLen, baseLen;
+ char* result;
+ /* You could add an environment variable override here */
+ /* if (getenv(TESTING_DATA_PATH)) */
+
+ /* concatenate the strings together */
+ pathLen = strlen(TESTING_DATA_PATH);
+ baseLen = strlen(base);
+ /* Allocate enough for the two parts of the string, plus one for the /
+ * and one for the null terminator */
+ result = AIR_CALLOC(pathLen + baseLen + 2, char);
+ if (result) {
+ /*
+ strcat(result, TESTING_DATA_PATH);
+ strcat(result, "/");
+ strcat(result, base);
+ */
+ airStrcpy(result, pathLen + 1, TESTING_DATA_PATH);
+ result[pathLen] = '/';
+ airStrcpy(result+pathLen+1, baseLen + 1, base);
+ }
+ return result;
+}
Deleted: teem/trunk/tests/testDataPath.h.in
===================================================================
--- teem/trunk/Testing/testDataPath.h.in 2025-09-05 17:48:54 UTC (rev 7363)
+++ teem/trunk/tests/testDataPath.h.in 2025-09-06 01:59:34 UTC (rev 7364)
@@ -1,61 +0,0 @@
-/*
- Teem: Tools to process and visualize scientific data and images
- Copyright (C) 2009--2019 University of Chicago
- Copyright (C) 2011 James Bigler
- Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
- Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License
- (LGPL) as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- The terms of redistributing and/or modifying this software also
- include exceptions to the LGPL that facilitate static linking.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <https://www.gnu.org/licenses/>.
-*/
-
-#define TESTING_DATA_PATH "${TESTING_DATA_PATH}"
-
-#include <stdlib.h>
-#include <string.h>
-#include <teem/air.h>
-
-/*
-** testDataPathPrefix allocates and returns a string which is
-** the given "base" prefixed with the path to the test datasets,
-** including the "/" between the path and "base". Caller is
-** responsible for freeing.
-**
-** Thanks to James Bigler for writing the first version of this.
-*/
-static char*
-testDataPathPrefix(const char* base) {
- size_t pathLen, baseLen;
- char* result;
- /* You could add an environment variable override here */
- /* if (getenv(TESTING_DATA_PATH)) */
-
- /* concatenate the strings together */
- pathLen = strlen(TESTING_DATA_PATH);
- baseLen = strlen(base);
- /* Allocate enough for the two parts of the string, plus one for the /
- * and one for the null terminator */
- result = AIR_CALLOC(pathLen + baseLen + 2, char);
- if (result) {
- /*
- strcat(result, TESTING_DATA_PATH);
- strcat(result, "/");
- strcat(result, base);
- */
- airStrcpy(result, pathLen + 1, TESTING_DATA_PATH);
- result[pathLen] = '/';
- airStrcpy(result+pathLen+1, baseLen + 1, base);
- }
- return result;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
